From f3db66917c8a39afa22aecb23b6fc6619b61885c Mon Sep 17 00:00:00 2001 From: Nicoleta Panaghiu Date: Fri, 24 Feb 2023 13:26:11 +0200 Subject: [PATCH] RED-6243: Disabled toggle button for UserAdmins when target user is admin. --- .../admin/screens/user-listing/user-listing-screen.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts index 06b311c55..d9fc22c84 100644 --- a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts @@ -85,7 +85,7 @@ export class UserListingScreenComponent extends ListingComponent implement } canDeactivate(user: User): boolean { - return !(user.isAdmin && this.currentUser.id === user.id); + return !((this.currentUser.isUserAdmin && !this.currentUser.isAdmin && user.isAdmin) || this.currentUser.id === user.id); } async ngOnInit() {