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

Merge pull request #2045 from umbraco/temp-U4-10106

Browse Source 
U4-10106 Cannot delete user groups
This commit is contained in:
Shannon Deminick
2017-07-14 10:53:27 +10:00
committed by GitHub
parent dfbd064de6 8347d8f23b
commit 3f6ec6e36f
7 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Umbraco.Web.UI.Client/src/common/resources/usergroups.resource.js
+13 -1
View File
@@ -59,11 +59,23 @@
"Failed to retrieve user groups");
}
function deleteUserGroups(userGroupIds) {
var query = "userGroupIds=" + userGroupIds.join("&userGroupIds=");
return umbRequestHelper.resourcePromise(
$http.post(
umbRequestHelper.getApiUrl(
"userGroupsApiBaseUrl",
"PostDeleteUserGroups",
query)),
'Failed to delete user groups');
}
var resource = {
saveUserGroup: saveUserGroup,
getUserGroup: getUserGroup,
getUserGroups: getUserGroups,
getUserGroupScaffold: getUserGroupScaffold
getUserGroupScaffold: getUserGroupScaffold,
deleteUserGroups: deleteUserGroups
};
return resource;
src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js
+14 -1
View File
@@ -1,7 +1,7 @@
(function () {
"use strict";
function UserGroupsController($scope, $timeout, $location, userGroupsResource) {
function UserGroupsController($scope, $timeout, $location, userGroupsResource, formHelper) {
var vm = this;
@@ -12,6 +12,7 @@
vm.clickUserGroup = clickUserGroup;
vm.clearSelection = clearSelection;
vm.selectUserGroup = selectUserGroup;
vm.deleteUserGroups = deleteUserGroups;
function onInit() {
@@ -57,6 +58,18 @@
}
}
function deleteUserGroups() {
if (vm.selection.length > 0) {
userGroupsResource.deleteUserGroups(vm.selection).then(function (data) {
clearSelection();
onInit();
formHelper.showNotifications(data);
}, function(error) {
formHelper.showNotifications(error.data);
});
}
}
function clearSelection() {
angular.forEach(vm.userGroups, function (userGroup) {
userGroup.selected = false;
src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html
+1 -1
View File
@@ -32,7 +32,7 @@
type="button"
label="Delete"
icon="icon-trash"
action="vm.deleteUserGroup()"
action="vm.deleteUserGroups()"
size="xs">
</umb-button>
</umb-editor-sub-header-content-right>
src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+2
View File
@@ -1126,6 +1126,8 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="scriptErrorHeader">Script view not saved</key>
<key alias="scriptErrorText">An error occurred saving the file.</key>
<key alias="cssErrorText">An error occurred saving the file.</key>
<key alias="deleteUserGroupsSuccess">Deleted %0% user groups</key>
<key alias="deleteUserGroupSuccess">%0% was deleted</key>
<key alias="enableUsersSuccess">Enabled %0% users</key>
<key alias="enableUsersError">An error occurred while enabling the users</key>
<key alias="disableUsersSuccess">Disabled %0% users</key>
src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+2
View File
@@ -1104,6 +1104,8 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="disableUserSuccess">%0% is now disabled</key>
<key alias="disableUserError">An error occurred while disabling the user</key>
<key alias="setUserGroupOnUsersSuccess">User groups have been set</key>
<key alias="deleteUserGroupsSuccess">Deleted %0% user groups</key>
<key alias="deleteUserGroupSuccess">%0% was deleted</key>
</area>
<area alias="stylesheet">
<key alias="aliasHelp">Uses CSS syntax ex: h1, .redHeader, .blueTex</key>
src/Umbraco.Web/Editors/UserGroupsController.cs
+16 -1
View File
@@ -5,7 +5,6 @@ using System.Net;
using System.Net.Http;
using System.Web.Http;
using AutoMapper;
using Umbraco.Core.Models;
using Umbraco.Core.Models.Membership;
using Umbraco.Core.Services;
using Umbraco.Web.Models.ContentEditing;
@@ -87,5 +86,21 @@ namespace Umbraco.Web.Editors
return display;
}
[HttpPost]
[HttpDelete]
public HttpResponseMessage PostDeleteUserGroups([FromUri] int[] userGroupIds)
{
var userGroups = Services.UserService.GetAllUserGroups(userGroupIds).ToArray();
foreach (var userGroup in userGroups)
{
Services.UserService.DeleteUserGroup(userGroup);
}
if (userGroups.Length > 1)
return Request.CreateNotificationSuccessResponse(
Services.TextService.Localize("speechBubbles/deleteUserGroupsSuccess", new[] {userGroups.Length.ToString()}));
return Request.CreateNotificationSuccessResponse(
Services.TextService.Localize("speechBubbles/deleteUserGroupSuccess", new[] {userGroups[0].Name}));
}
}
}
src/umbraco.sln
+2 -4
View File
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.26430.15
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web.UI", "Umbraco.Web.UI\Umbraco.Web.UI.csproj", "{4C4C194C-B5E4-4991-8F87-4373E24CC19F}"
EndProject
@@ -127,9 +127,7 @@ Global
{4C4C194C-B5E4-4991-8F87-4373E24CC19F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4C4C194C-B5E4-4991-8F87-4373E24CC19F}.Release|Any CPU.Build.0 = Release|Any CPU
{3819A550-DCEC-4153-91B4-8BA9F7F0B9B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3819A550-DCEC-4153-91B4-8BA9F7F0B9B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3819A550-DCEC-4153-91B4-8BA9F7F0B9B4}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{3819A550-DCEC-4153-91B4-8BA9F7F0B9B4}.Release|Any CPU.Build.0 = Debug|Any CPU
{651E1350-91B6-44B7-BD60-7207006D7003}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{651E1350-91B6-44B7-BD60-7207006D7003}.Debug|Any CPU.Build.0 = Debug|Any CPU
{651E1350-91B6-44B7-BD60-7207006D7003}.Release|Any CPU.ActiveCfg = Release|Any CPU