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

V10: Dont disable invited users (#13600)

Browse Source 
* Dont allow disable user when invited

* Use data instead of selection

* return succesfully disabled users

* Disable disable button when invited

* Add integration tests

* Remove unused usings

* Update src/Umbraco.Web.BackOffice/Controllers/UsersController.cs

Co-authored-by: Kenn Jacobsen <kja@umbraco.dk>

* Create DisabledUsersModel

* use data.disabledUsers

* Return OK if no users to be saved

* User disabledUsersModel

Co-authored-by: Zeegaan <nge@umbraco.dk>
Co-authored-by: Kenn Jacobsen <kja@umbraco.dk>
This commit is contained in:
Nikolaj Geisle
2022-12-20 09:53:54 +01:00
committed by GitHub
parent 9c21951d02
commit d62e2d731b
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") {