From e276c7a1bfd2f3e4bfcc107dfdef496a41f570f5 Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 20 Jun 2017 12:34:33 +1000 Subject: [PATCH] Wires up getUserGroupScaffold --- .../src/common/resources/users.resource.js | 13 ++++++++++++- .../src/views/users/group.controller.js | 5 +++++ src/Umbraco.Web/Editors/UsersController.cs | 9 +++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/users.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/users.resource.js index 242afd9525..c5ed1a7fcc 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/users.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/users.resource.js @@ -22,6 +22,16 @@ 'Failed to clear the user avatar ' + userId); } + function getUserGroupScaffold() { + + return umbRequestHelper.resourcePromise( + $http.get( + umbRequestHelper.getApiUrl( + "userApiBaseUrl", + "GetEmptyUserGroup")), + 'Failed to get the user group scaffold'); + } + function disableUsers(userIds) { if (!userIds) { throw "userIds not specified"; @@ -195,7 +205,8 @@ saveUser: saveUser, getUserGroup: getUserGroup, getUserGroups: getUserGroups, - clearAvatar: clearAvatar + clearAvatar: clearAvatar, + getUserGroupScaffold: getUserGroupScaffold }; return resource; 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 a912c16cfe..6953d8b5a8 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 @@ -27,8 +27,13 @@ }); if ($routeParams.create) { + // get user group scaffold + usersResource.getUserGroupScaffold().then(function (userGroup) { + vm.userGroup = userGroup; + setSectionIcon(vm.userGroup.sections); makeBreadcrumbs(); vm.loading = false; + }); } else { // get user group usersResource.getUserGroup($routeParams.id).then(function (userGroup) { diff --git a/src/Umbraco.Web/Editors/UsersController.cs b/src/Umbraco.Web/Editors/UsersController.cs index 67d1bc6f11..a21ee9166f 100644 --- a/src/Umbraco.Web/Editors/UsersController.cs +++ b/src/Umbraco.Web/Editors/UsersController.cs @@ -343,6 +343,15 @@ namespace Umbraco.Web.Editors return display; } + /// + /// Returns the scaffold for creating a new user group + /// + /// + public UserGroupDisplay GetEmptyUserGroup() + { + return new UserGroupDisplay(); + } + private HttpContextBase EnsureHttpContext() { var attempt = this.TryGetHttpContext();