External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-21 10:57:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Prevent users from attempting to delete pending approvals

Browse Source
This commit is contained in:
mabashian
2020-11-13 13:16:34 -05:00
parent 929be1652a
commit b8b3424c1f
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/ui_next/src/components/PaginatedDataList/ToolbarDeleteButton.jsx
View File

@@ -61,10 +61,6 @@ const ItemToDelete = shape({
}).isRequired, }).isRequired,
}); });
function cannotDelete(item) {
return !item.summary_fields.user_capabilities.delete;
}
function ToolbarDeleteButton({ function ToolbarDeleteButton({
itemsToDelete, itemsToDelete,
pluralizedItemName, pluralizedItemName,
@@ -72,6 +68,7 @@ function ToolbarDeleteButton({
onDelete, onDelete,
warningMessage, warningMessage,
i18n, i18n,
cannotDelete,
}) { }) {
const { isKebabified, onKebabModalChange } = useContext(KebabifiedContext); const { isKebabified, onKebabModalChange } = useContext(KebabifiedContext);
const [isModalOpen, setIsModalOpen] = useState(false); const [isModalOpen, setIsModalOpen] = useState(false);
@@ -100,7 +97,7 @@ function ToolbarDeleteButton({
return ( return (
<div> <div>
{errorMessage.length > 0 {errorMessage.length > 0
? errorMessage ? `${errorMessage}: ${itemsUnableToDelete}`
: i18n._( : i18n._(
t`You do not have permission to delete ${pluralizedItemName}: ${itemsUnableToDelete}` t`You do not have permission to delete ${pluralizedItemName}: ${itemsUnableToDelete}`
)} )}
@@ -193,12 +190,14 @@ ToolbarDeleteButton.propTypes = {
pluralizedItemName: string, pluralizedItemName: string,
errorMessage: string, errorMessage: string,
warningMessage: node, warningMessage: node,
cannotDelete: func,
}; };
ToolbarDeleteButton.defaultProps = { ToolbarDeleteButton.defaultProps = {
pluralizedItemName: 'Items', pluralizedItemName: 'Items',
errorMessage: '', errorMessage: '',
warningMessage: null, warningMessage: null,
cannotDelete: item => !item.summary_fields.user_capabilities.delete,
}; };
export default withI18n()(ToolbarDeleteButton); export default withI18n()(ToolbarDeleteButton);

7
awx/ui_next/src/screens/WorkflowApproval/WorkflowApprovalList/WorkflowApprovalList.jsx
View File

@@ -212,6 +212,13 @@ function WorkflowApprovalsList({ i18n }) {
onDelete={handleDelete} onDelete={handleDelete}
itemsToDelete={selected} itemsToDelete={selected}
pluralizedItemName={i18n._(t`Workflow Approvals`)} pluralizedItemName={i18n._(t`Workflow Approvals`)}
cannotDelete={item =>
item.status === 'pending' ||
!item.summary_fields.user_capabilities.delete
}
errorMessage={i18n._(
t`These approvals cannot be deleted due to insufficient permissions or a pending job status`
)}
/>, />,
]} ]}
/> />