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

rename from role to group

Browse Source
This commit is contained in:
Mads Rasmussen
2017-05-23 11:02:52 +02:00
parent d56bee8761
commit 41460d5500
8 changed files with 84 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.Client/src/common/resources/users.resource.js
View File

@@ -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,

18
src/Umbraco.Web.UI.Client/src/views/users/role.controller.js → src/Umbraco.Web.UI.Client/src/views/users/group.controller.js
View File

@@ -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);
})();

24
src/Umbraco.Web.UI.Client/src/views/users/role.html → src/Umbraco.Web.UI.Client/src/views/users/group.html
View File

@@ -1,4 +1,4 @@
<div ng-controller="Umbraco.Editors.Users.RoleController as vm" class="clearfix">
<div ng-controller="Umbraco.Editors.Users.GroupController as vm" class="clearfix">
<umb-load-indicator ng-show="vm.loading"></umb-load-indicator>
@@ -7,8 +7,8 @@
<umb-editor-view>
<umb-editor-header
name="vm.userRole.name"
icon="vm.userRole.icon"
name="vm.userGroup.name"
icon="vm.userGroup.icon"
hide-description="true"
hide-alias="true">
</umb-editor-header>
@@ -28,17 +28,17 @@
<umb-control-group label="Sections" description="Lorem ipsum dolor sit amet, consectetur adipiscing elit.">
<umb-node-preview
style="max-width: 100%;"
ng-repeat="section in vm.userRole.sections"
ng-repeat="section in vm.userGroup.sections"
icon="section.icon"
name="section.name"
allow-remove="true"
on-remove="vm.removeSelectedItem($index, vm.userRole.sections)">
on-remove="vm.removeSelectedItem($index, vm.userGroup.sections)">
</umb-node-preview>
<a href=""
style="max-width: 100%;"
class="umb-node-preview-add"
ng-click="vm.openUserRolePicker()"
ng-click="vm.openUserGroupPicker()"
prevent-default>
<localize key="general_add">Add</localize>
</a>
@@ -47,11 +47,11 @@
<umb-control-group label="Content start nodes" description="Lorem ipsum dolor sit amet, consectetur adipiscing elit.">
<umb-node-preview
style="max-width: 100%;"
ng-repeat="node in vm.userRole.startNodesContent"
ng-repeat="node in vm.userGroup.startNodesContent"
icon="node.icon"
name="node.name"
allow-remove="true"
on-remove="vm.removeSelectedItem($index, vm.userRole.startNodesContent)">
on-remove="vm.removeSelectedItem($index, vm.userGroup.startNodesContent)">
</umb-node-preview>
<a href=""
@@ -66,11 +66,11 @@
<umb-control-group label="Media start nodes" description="Donec quis lacinia ligula. Suspendisse ultrices risus ante">
<umb-node-preview
style="max-width: 100%;"
ng-repeat="node in vm.userRole.startNodesMedia"
ng-repeat="node in vm.userGroup.startNodesMedia"
icon="node.icon"
name="node.name"
allow-remove="true"
on-remove="vm.removeSelectedItem($index, vm.userRole.startNodesMedia)">
on-remove="vm.removeSelectedItem($index, vm.userGroup.startNodesMedia)">
</umb-node-preview>
<a href=""
@@ -104,11 +104,11 @@
<div class="umb-package-details__section-title">Users</div>
<umb-user-preview
ng-repeat="user in vm.userRole.users"
ng-repeat="user in vm.userGroup.users"
name="user.name"
avatar="user.avatar"
allow-remove="true"
on-remove="vm.removeSelectedUser($index, vm.userRole.users)">
on-remove="vm.removeSelectedUser($index, vm.userGroup.users)">
</umb-user-preview>
<a href=""

6
src/Umbraco.Web.UI.Client/src/views/users/overview.controller.js
View File

@@ -16,10 +16,10 @@
"active": !usersUri || usersUri === "users"
},
{
"name": "Roles",
"name": "Groups",
"icon": "icon-users",
"view": "views/users/views/roles/roles.html",
"active": usersUri === "roles"
"view": "views/users/views/groups/groups.html",
"active": usersUri === "groups"
}
];

24
src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
View File

@@ -11,7 +11,7 @@
vm.breadcrumbs = [];
vm.goToPage = goToPage;
vm.openUserRolePicker = openUserRolePicker;
vm.openUserGroupPicker = openUserGroupPicker;
vm.openContentPicker = openContentPicker;
vm.openMediaPicker = openMediaPicker;
vm.removeSelectedItem = removeSelectedItem;
@@ -41,28 +41,28 @@
$location.path(ancestor.path).search("subview", ancestor.subView);
}
function openUserRolePicker() {
vm.userRolePicker = {
title: "Select user roles",
view: "userrolepicker",
selection: vm.user.userRoles,
function openUserGroupPicker() {
vm.userGroupPicker = {
title: "Select user groups",
view: "usergrouppicker",
selection: vm.user.userGroups,
closeButtonLabel: "Cancel",
show: true,
submit: function(model) {
// apply changes
if(model.selection) {
vm.user.userRoles = model.selection;
vm.user.userGroups = model.selection;
}
vm.userRolePicker.show = false;
vm.userRolePicker = null;
vm.userGroupPicker.show = false;
vm.userGroupPicker = null;
},
close: function(oldModel) {
// rollback on close
if(oldModel.selection) {
vm.user.userRoles = oldModel.selection;
vm.user.userGroups = oldModel.selection;
}
vm.userRolePicker.show = false;
vm.userRolePicker = null;
vm.userGroupPicker.show = false;
vm.userGroupPicker = null;
}
};
}

28
src/Umbraco.Web.UI.Client/src/views/users/user.html
View File

@@ -45,23 +45,23 @@
<div class="test-group-title">Permissions</div>
<div class="test-group-content block-form">
<umb-control-group style="margin-bottom: 25px;" label="Roles" description="Aliquam laoreet metus porta nisi pellentesque">
<umb-control-group style="margin-bottom: 25px;" label="Groups" description="Aliquam laoreet metus porta nisi pellentesque">
<umb-user-role-preview
ng-repeat="userRole in vm.user.userRoles"
icon="userRole.icon"
name="userRole.name"
sections="userRole.sections"
content-start-nodes="userRole.startNodesContent"
media-start-nodes="userRole.startNodesMedia"
<umb-user-group-preview
ng-repeat="userGroup in vm.user.userGroups"
icon="userGroup.icon"
name="userGroup.name"
sections="userGroup.sections"
content-start-nodes="userGroup.startNodesContent"
media-start-nodes="userGroup.startNodesMedia"
allow-remove="true"
on-remove="vm.removeSelectedItem($index, vm.user.userRoles)">
</umb-user-role-preview>
on-remove="vm.removeSelectedItem($index, vm.user.userGroups)">
</umb-user-group-preview>
<a href=""
style="max-width: 100%;"
class="umb-node-preview-add"
ng-click="vm.openUserRolePicker()"
ng-click="vm.openUserGroupPicker()"
prevent-default>
<localize key="general_add">Add</localize>
</a>
@@ -248,9 +248,9 @@
</form>
<umb-overlay
ng-if="vm.userRolePicker.show"
model="vm.userRolePicker"
view="vm.userRolePicker.view"
ng-if="vm.userGroupPicker.show"
model="vm.userGroupPicker"
view="vm.userGroupPicker.view"
position="right">
</umb-overlay>

46
src/Umbraco.Web.UI.Client/src/views/users/views/roles/roles.controller.js → src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.controller.js
View File

@@ -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);
})();

18
src/Umbraco.Web.UI.Client/src/views/users/views/roles/roles.html → src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html
View File

@@ -1,4 +1,4 @@
<div ng-controller="Umbraco.Editors.Users.RolesController as vm" class="clearfix">
<div ng-controller="Umbraco.Editors.Users.GroupsController as vm" class="clearfix">
<umb-editor-sub-header>
@@ -7,8 +7,8 @@
<umb-button
type="button"
button-style="success"
action="vm.createUserRole()"
label="Create Role">
action="vm.createUserGroup()"
label="Create Group">
</umb-button>
</umb-editor-sub-header-content-left>
@@ -46,7 +46,7 @@
</umb-button>
</umb-editor-sub-header-section>
<umb-editor-sub-header-section>
<strong>{{ vm.selection.length }} <localize key="general_of">of</localize> {{ vm.userRoles.length }} <localize key="general_selected">selected</localize></strong>
<strong>{{ vm.selection.length }} <localize key="general_of">of</localize> {{ vm.userGroups.length }} <localize key="general_selected">selected</localize></strong>
</umb-editor-sub-header-section>
</umb-editor-sub-header-content-left>
@@ -56,16 +56,16 @@
button-style="link"
label="Delete"
icon="icon-trash"
action="vm.deleteUserRole()">
action="vm.deleteUserGroup()">
</umb-button>
</umb-editor-sub-header-content-right>
</umb-editor-sub-header>
<div ng-repeat="userRole in vm.userRoles" class="flex items-center" ng-click="vm.selectUserRole(userRole, vm.selection)">
<i class="{{userRole.icon}}"></i>
<div class="bold" style="margin-right: 5px;">{{userRole.name}}</div>
<a href="" ng-click="vm.goToUserRole(userRole)">Edit</a>
<div ng-repeat="userGroup in vm.userGroups" class="flex items-center" ng-click="vm.selectUserGroup(userGroup, vm.selection)">
<i class="{{userGroup.icon}}"></i>
<div class="bold" style="margin-right: 5px;">{{userGroup.name}}</div>
<a href="" ng-click="vm.goToUserGroup(userGroup)">Edit</a>
</div>
</div>