From c02657fb8e422110ac0c62c8836e6aabe7d1be71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Fri, 8 Oct 2021 15:46:30 +0300 Subject: [PATCH] RED-2379 --- .../user-listing/user-listing-screen.component.html | 7 ++++++- .../screens/user-listing/user-listing-screen.component.ts | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html index f78e18ef5..a3d0c638a 100644 --- a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.html @@ -74,7 +74,12 @@
{{ user.email || '-' }}
- +
{{ getDisplayRoles(user) }}
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 bb1715711..ef3f76702 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 @@ -63,6 +63,10 @@ export class UserListingScreenComponent extends ListingComponent implement return entities$.pipe(map(all => !all.find(u => u.id === this.currentUser.id))); } + canDeactivate(user: User): boolean { + return !(user.isAdmin && this.currentUser.id === user.id); + } + async ngOnInit() { await this._loadData(); }