yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-12 18:53:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix batch-delete

Browse Source 
Signed-off-by: soupette <cyril.lpz@gmail.com>
This commit is contained in:
soupette 2020-06-03 17:26:25 +02:00 committed by Alexandre Bodin
parent ca5f97aa5d
commit fa7d906494
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/strapi-admin/admin/ee/containers/Roles/ListPage/RoleRow.js
View File

@ -14,11 +14,7 @@ const RoleRow = ({ role, onRoleToggle, onRoleDuplicate, onRoleRemove, selectedRo
const handleRoleSelection = e => {
e.stopPropagation();
if (role.usersCount) {
strapi.notification.info('Roles.ListPage.notification.delete-not-allowed');
} else {
onRoleToggle(role.id);
}
onRoleToggle(role.id);
};
const handleClickDelete = () => {

12
packages/strapi-admin/admin/ee/containers/Roles/ListPage/index.js
View File

@ -53,10 +53,20 @@ const RoleListPage = () => {
const handleConfirmDeleteData = async () => {
try {
const filteredRoles = selectedRoles.filter(currentId => {
const currentRole = roles.find(role => role.id === currentId);
return currentRole.usersCount === 0;
});
if (selectedRoles.length !== filteredRoles.length) {
strapi.notification.info('Roles.ListPage.notification.delete-all-not-allowed');
}
await request('/admin/roles/batch-delete', {
method: 'POST',
body: {
ids: selectedRoles,
ids: filteredRoles,
},
});

1
packages/strapi-admin/admin/src/translations/en.json
View File

@ -345,6 +345,7 @@
"app.containers.AuthPage.ForgotPasswordSuccess.text.contact-admin": "If you do not receive this link, please contact your administrator.",
"app.containers.AuthPage.ForgotPasswordSuccess.title": "Email sent",
"Roles.ListPage.notification.delete-not-allowed": "A role cannot be deleted if associated with users",
"Roles.ListPage.notification.delete-all-not-allowed": "Some roles could not be deleted since they are associated with users",
"Roles.RoleRow.user-count.plural": "{number} users",
"Roles.RoleRow.user-count.singular": "{number} user",
"Roles.components.List.empty.withSearch": "There is no role corresponding to the search ({search})..."