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 c5d1f7d1db..35f85063e0 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 @@ -103,7 +103,7 @@ } - function getUserRole() { + function getUserGroup() { var deferred = $q.defer(); var user = { "name": "Admin", @@ -188,7 +188,7 @@ var resource = { getUser: getUser, - getUserRole: getUserRole, + getUserGroup: getUserGroup, getUserGroups: getUserGroups, disableUsers: disableUsers, enableUsers: enableUsers, diff --git a/src/Umbraco.Web.UI.Client/src/views/users/role.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js similarity index 85% rename from src/Umbraco.Web.UI.Client/src/views/users/role.controller.js rename to src/Umbraco.Web.UI.Client/src/views/users/group.controller.js index 12f23d3f7e..ef2f9d378d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/role.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js @@ -1,13 +1,13 @@ (function () { "use strict"; - function UserRoleEditController($scope, $timeout, $location, usersResource) { + function UserGroupEditController($scope, $timeout, $location, usersResource) { var vm = this; vm.loading = false; vm.page = {}; - vm.userRole = {}; + vm.userGroup = {}; vm.goToPage = goToPage; vm.openSectionPicker = openSectionPicker; @@ -21,8 +21,8 @@ vm.loading = true; // get user - usersResource.getUserRole().then(function (userRole) { - vm.userRole = userRole; + usersResource.getUserGroup().then(function (userGroup) { + vm.userGroup = userGroup; makeBreadcrumbs(); }); @@ -49,7 +49,7 @@ show: true, submit: function(model) { if(model.selection) { - vm.userRole.startNodesContent = model.selection; + vm.userGroup.startNodesContent = model.selection; } vm.contentPicker.show = false; vm.contentPicker = null; @@ -72,7 +72,7 @@ show: true, submit: function(model) { if(model.selection) { - vm.userRole.startNodesMedia = model.selection; + vm.userGroup.startNodesMedia = model.selection; } vm.contentPicker.show = false; vm.contentPicker = null; @@ -104,10 +104,10 @@ { "name": "Groups", "path": "/users/users/overview", - "subView": "roles" + "subView": "groups" }, { - "name": vm.userRole.name + "name": vm.userGroup.name } ]; } @@ -116,6 +116,6 @@ } - angular.module("umbraco").controller("Umbraco.Editors.Users.RoleController", UserRoleEditController); + angular.module("umbraco").controller("Umbraco.Editors.Users.GroupController", UserGroupEditController); })(); diff --git a/src/Umbraco.Web.UI.Client/src/views/users/role.html b/src/Umbraco.Web.UI.Client/src/views/users/group.html similarity index 93% rename from src/Umbraco.Web.UI.Client/src/views/users/role.html rename to src/Umbraco.Web.UI.Client/src/views/users/group.html index d8c79c881e..813cb80006 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/role.html +++ b/src/Umbraco.Web.UI.Client/src/views/users/group.html @@ -1,4 +1,4 @@ -
+
@@ -7,8 +7,8 @@ @@ -28,17 +28,17 @@ + on-remove="vm.removeSelectedItem($index, vm.userGroup.sections)"> Add @@ -47,11 +47,11 @@ + on-remove="vm.removeSelectedItem($index, vm.userGroup.startNodesContent)"> + on-remove="vm.removeSelectedItem($index, vm.userGroup.startNodesMedia)"> Users
+ on-remove="vm.removeSelectedUser($index, vm.userGroup.users)"> Permissions
- + - - + on-remove="vm.removeSelectedItem($index, vm.user.userGroups)"> + Add @@ -248,9 +248,9 @@ diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/roles/roles.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js similarity index 53% rename from src/Umbraco.Web.UI.Client/src/views/users/views/roles/roles.controller.js rename to src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js index 6a602e4cfa..4c198b91a8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/views/roles/roles.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js @@ -1,11 +1,11 @@ (function () { "use strict"; - function UserRolesController($scope, $timeout, $location, usersResource) { + function UserGroupsController($scope, $timeout, $location, usersResource) { var vm = this; - vm.userRoles = []; + vm.userGroups = []; vm.selection = []; vm.viewState = 'overview'; @@ -15,9 +15,9 @@ }; vm.setViewState = setViewState; - vm.goToUserRole = goToUserRole; + vm.goToUserGroup = goToUserGroup; vm.clearSelection = clearSelection; - vm.selectUserRole = selectUserRole; + vm.selectUserGroup = selectUserGroup; vm.selectAll = selectAll; vm.areAllSelected = areAllSelected; @@ -26,8 +26,8 @@ vm.loading = true; // Get users - usersResource.getUserGroups().then(function (userRoles) { - vm.userRoles = userRoles; + usersResource.getUserGroups().then(function (userGroups) { + vm.userGroups = userGroups; }); // fake loading @@ -41,46 +41,46 @@ vm.viewState = state; } - function selectUserRole(userRole, selection) { - if(userRole.selected) { - var index = selection.indexOf(userRole.id); + function selectUserGroup(userGroup, selection) { + if(userGroup.selected) { + var index = selection.indexOf(userGroup.id); selection.splice(index, 1); - userRole.selected = false; + userGroup.selected = false; } else { - userRole.selected = true; - vm.selection.push(userRole.id); + userGroup.selected = true; + vm.selection.push(userGroup.id); } } function clearSelection() { - angular.forEach(vm.userRoles, function(userRole){ - userRole.selected = false; + angular.forEach(vm.userGroups, function(userGroup){ + userGroup.selected = false; }); vm.selection = []; } - function goToUserRole(userRole) { - $location.path('users/users/role/' + userRole.id); + function goToUserGroup(userGroup) { + $location.path('users/users/group/' + userGroup.id); } function selectAll() { if(areAllSelected()) { vm.selection = []; - angular.forEach(vm.userRoles, function(userRole){ - userRole.selected = false; + angular.forEach(vm.userGroups, function(userGroup){ + userGroup.selected = false; }); } else { // clear selection so we don't add the same user twice vm.selection = []; // select all users - angular.forEach(vm.userRoles, function(userRole){ - userRole.selected = true; - vm.selection.push(userRole.id); + angular.forEach(vm.userGroups, function(userGroup){ + userGroup.selected = true; + vm.selection.push(userGroup.id); }); } } function areAllSelected() { - if(vm.selection.length === vm.userRoles.length) { + if(vm.selection.length === vm.userGroups.length) { return true; } } @@ -89,6 +89,6 @@ } - angular.module("umbraco").controller("Umbraco.Editors.Users.RolesController", UserRolesController); + angular.module("umbraco").controller("Umbraco.Editors.Users.GroupsController", UserGroupsController); })(); diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/roles/roles.html b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html similarity index 78% rename from src/Umbraco.Web.UI.Client/src/views/users/views/roles/roles.html rename to src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html index b90edb55dc..c7e0c0e504 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/views/roles/roles.html +++ b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html @@ -1,4 +1,4 @@ -
+
@@ -7,8 +7,8 @@ + action="vm.createUserGroup()" + label="Create Group"> @@ -46,7 +46,7 @@ - {{ vm.selection.length }} of {{ vm.userRoles.length }} selected + {{ vm.selection.length }} of {{ vm.userGroups.length }} selected @@ -56,16 +56,16 @@ button-style="link" label="Delete" icon="icon-trash" - action="vm.deleteUserRole()"> + action="vm.deleteUserGroup()"> -
- -
{{userRole.name}}
- Edit +
+ +
{{userGroup.name}}
+ Edit
\ No newline at end of file