-
-
\ No newline at end of file
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
index 2001b95e99..38f6758651 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.controller.js
@@ -196,27 +196,23 @@
vm.activeLayout = selectedLayout;
}
- function selectUser(user, selection, event) {
-
- // prevent the current user to be selected
- if (!user.isCurrentUser) {
-
- if (user.selected) {
- var index = selection.indexOf(user.id);
- selection.splice(index, 1);
- user.selected = false;
- } else {
- user.selected = true;
- vm.selection.push(user.id);
- }
-
- setBulkActions(vm.users);
-
- if (event) {
- event.preventDefault();
- event.stopPropagation();
- }
+ function selectUser(user) {
+
+ if (user.isCurrentUser) {
+ return;
}
+
+ if (user.selected) {
+ var index = vm.selection.indexOf(user.id);
+ vm.selection.splice(index, 1);
+ user.selected = false;
+ } else {
+ user.selected = true;
+ vm.selection.push(user.id);
+ }
+
+ setBulkActions(vm.users);
+
}
function clearSelection() {
@@ -227,11 +223,7 @@
}
function clickUser(user) {
- if (vm.selection.length > 0) {
- selectUser(user, vm.selection);
- } else {
- goToUser(user.id);
- }
+ goToUser(user.id);
}
function disableUsers() {
@@ -625,18 +617,20 @@
var firstSelectedUserGroups;
angular.forEach(users, function (user) {
-
+
if (!user.selected) {
return;
}
-
+
+
// if the current user is selected prevent any bulk actions with the user included
if (user.isCurrentUser) {
vm.allowDisableUser = false;
vm.allowEnableUser = false;
vm.allowUnlockUser = false;
vm.allowSetUserGroup = false;
- return;
+
+ return false;
}
if (user.userDisplayState && user.userDisplayState.key === "Disabled") {
@@ -660,16 +654,17 @@
}
// store the user group aliases of the first selected user
- if (!firstSelectedUserGroups) {
- firstSelectedUserGroups = user.userGroups.map(function (ug) { return ug.alias; });
- vm.allowSetUserGroup = true;
- } else if (vm.allowSetUserGroup === true) {
- // for 2nd+ selected user, compare the user group aliases to determine if we should allow bulk editing.
- // we don't allow bulk editing of users not currently having the same assigned user groups, as we can't
- // really support that in the user group picker.
- var userGroups = user.userGroups.map(function (ug) { return ug.alias; });
- if (_.difference(firstSelectedUserGroups, userGroups).length > 0) {
- vm.allowSetUserGroup = false;
+ if (vm.allowSetUserGroup === true) {
+ if (!firstSelectedUserGroups) {
+ firstSelectedUserGroups = user.userGroups.map(function (ug) { return ug.alias; });
+ } else {
+ // for 2nd+ selected user, compare the user group aliases to determine if we should allow bulk editing.
+ // we don't allow bulk editing of users not currently having the same assigned user groups, as we can't
+ // really support that in the user group picker.
+ var userGroups = user.userGroups.map(function (ug) { return ug.alias; });
+ if (_.difference(firstSelectedUserGroups, userGroups).length > 0) {
+ vm.allowSetUserGroup = false;
+ }
}
}
});
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
index c764e919c8..cefc3c5c86 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
@@ -5,7 +5,7 @@
-
+
@@ -48,7 +48,7 @@
@@ -57,16 +57,16 @@
{{ vm.selection.length }} of {{ vm.users.length }} selected
-
+
@@ -74,22 +74,22 @@
-
+