MM-57841 - Updating post delete modal (#26907)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
4db2ae5753
Коммит
6028cbe4e2
@@ -72,8 +72,6 @@ exports[`components/delete_post_modal should match snapshot for delete_post_moda
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
<br />
|
|
||||||
<br />
|
|
||||||
</ModalBody>
|
</ModalBody>
|
||||||
<ModalFooter
|
<ModalFooter
|
||||||
bsClass="modal-footer"
|
bsClass="modal-footer"
|
||||||
@@ -177,8 +175,9 @@ exports[`components/delete_post_modal should match snapshot for delete_post_moda
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
<br />
|
<div
|
||||||
<br />
|
className="mt-2"
|
||||||
|
>
|
||||||
<MemoizedFormattedMessage
|
<MemoizedFormattedMessage
|
||||||
defaultMessage="This post has {count, number} {count, plural, one {comment} other {comments}} on it."
|
defaultMessage="This post has {count, number} {count, plural, one {comment} other {comments}} on it."
|
||||||
id="delete_post.warning"
|
id="delete_post.warning"
|
||||||
@@ -188,6 +187,7 @@ exports[`components/delete_post_modal should match snapshot for delete_post_moda
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
|
</div>
|
||||||
</ModalBody>
|
</ModalBody>
|
||||||
<ModalFooter
|
<ModalFooter
|
||||||
bsClass="modal-footer"
|
bsClass="modal-footer"
|
||||||
@@ -291,8 +291,6 @@ exports[`components/delete_post_modal should match snapshot for post with 1 comm
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
<br />
|
|
||||||
<br />
|
|
||||||
</ModalBody>
|
</ModalBody>
|
||||||
<ModalFooter
|
<ModalFooter
|
||||||
bsClass="modal-footer"
|
bsClass="modal-footer"
|
||||||
|
|||||||
@@ -106,6 +106,7 @@ export default class DeletePostModal extends React.PureComponent<Props, State> {
|
|||||||
|
|
||||||
if (this.props.commentCount > 0 && this.props.post.root_id === '') {
|
if (this.props.commentCount > 0 && this.props.post.root_id === '') {
|
||||||
commentWarning = (
|
commentWarning = (
|
||||||
|
<div className='mt-2'>
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id='delete_post.warning'
|
id='delete_post.warning'
|
||||||
defaultMessage='This post has {count, number} {count, plural, one {comment} other {comments}} on it.'
|
defaultMessage='This post has {count, number} {count, plural, one {comment} other {comments}} on it.'
|
||||||
@@ -113,6 +114,7 @@ export default class DeletePostModal extends React.PureComponent<Props, State> {
|
|||||||
count: this.props.commentCount,
|
count: this.props.commentCount,
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -161,8 +163,6 @@ export default class DeletePostModal extends React.PureComponent<Props, State> {
|
|||||||
term: (postTerm),
|
term: (postTerm),
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<br/>
|
|
||||||
<br/>
|
|
||||||
{commentWarning}
|
{commentWarning}
|
||||||
</Modal.Body>
|
</Modal.Body>
|
||||||
<Modal.Footer>
|
<Modal.Footer>
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user