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

Merge remote-tracking branch 'origin/v10/dev' into v11/dev

Browse Source
This commit is contained in:
Bjarke Berg
2022-12-20 10:19:36 +01:00
parent 1332ba51e8 fae74c53ba
commit 03e00cbed2
4 changed files with 110 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -334,7 +334,7 @@
vm.disableUserButtonState = "busy";
usersResource.disableUsers(vm.selection).then(function (data) {
// update userState
vm.selection.forEach(function (userId) {
data.disabledUserIds.forEach(function (userId) {
var user = getUserFromArrayById(userId, vm.users);
if (user) {
user.userState = "Disabled";
@@ -808,6 +808,7 @@
if (user.userDisplayState && user.userDisplayState.key === "Invited") {
vm.allowEnableUser = false;
vm.allowDisableUser = false;
}
if (user.userDisplayState && user.userDisplayState.key === "LockedOut") {