yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not show cryptic confirm dialog when editing group

Browse Source
This commit is contained in:
Kenn Jacobsen
2020-10-02 21:12:31 +02:00
committed by Nathan Woulfe
parent bb7e53434d
commit 8de2f4920a
2 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/Umbraco.Web.UI.Client/src/views/users/group.controller.js
View File

@@ -23,7 +23,9 @@
vm.openContentPicker = openContentPicker;
vm.openMediaPicker = openMediaPicker;
vm.openUserPicker = openUserPicker;
vm.removeSelectedItem = removeSelectedItem;
vm.removeSection = removeSection;
vm.removeAssignedPermissions = removeAssignedPermissions;
vm.removeUser = removeUser;
vm.clearStartNode = clearStartNode;
vm.save = save;
vm.openGranularPermissionsPicker = openGranularPermissionsPicker;
@@ -281,28 +283,33 @@
}
function removeSelectedItem(index, selection) {
if (selection && selection.length > 0) {
function removeSection(index) {
vm.userGroup.sections.splice(index, 1);
}
const dialog = {
view: "views/users/views/overlays/remove.html",
username: selection[index].username,
userGroupName: vm.userGroup.name.toLowerCase(),
submitButtonLabelKey: "defaultdialogs_yesRemove",
submitButtonStyle: "danger",
function removeAssignedPermissions(index) {
vm.userGroup.assignedPermissions.splice(index, 1);
}
submit: function () {
selection.splice(index, 1);
function removeUser(index) {
const dialog = {
view: "views/users/views/overlays/remove.html",
username: vm.userGroup.users[index].username,
userGroupName: vm.userGroup.name.toLowerCase(),
submitButtonLabelKey: "defaultdialogs_yesRemove",
submitButtonStyle: "danger",
overlayService.close();
},
close: function () {
overlayService.close();
}
};
submit: function () {
vm.userGroup.users.splice(index, 1);
overlayService.open(dialog);
}
overlayService.close();
},
close: function () {
overlayService.close();
}
};
overlayService.open(dialog);
}
function clearStartNode(type) {

6
src/Umbraco.Web.UI.Client/src/views/users/group.html
View File

@@ -35,7 +35,7 @@
icon="section.icon"
name="section.name"
allow-remove="true"
on-remove="vm.removeSelectedItem($index, vm.userGroup.sections)">
on-remove="vm.removeSection($index)">
</umb-node-preview>
<button type="button"
@@ -115,7 +115,7 @@
name="node.name"
permissions="node.allowedPermissions"
allow-remove="true"
on-remove="vm.removeSelectedItem($index, vm.userGroup.assignedPermissions)"
on-remove="vm.removeAssignedPermissions($index)"
allow-edit="true"
on-edit="vm.setPermissionsForNode(node)">
</umb-node-preview>
@@ -143,7 +143,7 @@
name="user.name"
avatars="user.avatars"
allow-remove="true"
on-remove="vm.removeSelectedItem($index, vm.userGroup.users)">
on-remove="vm.removeUser($index)">
</umb-user-preview>
<button type="button"