diff --git a/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js index c29bda19ed..fd5cfc4e4f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js @@ -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) { diff --git a/src/Umbraco.Web.UI.Client/src/views/users/group.html b/src/Umbraco.Web.UI.Client/src/views/users/group.html index 2df7afc066..f423d06c3c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/group.html +++ b/src/Umbraco.Web.UI.Client/src/views/users/group.html @@ -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)">