From d9f46347009fcaaf45a3bf0fb89b23bd7e0baaff Mon Sep 17 00:00:00 2001 From: Sebastian Date: Thu, 12 Dec 2019 16:56:51 +0100 Subject: [PATCH] Fix --- .../pages/users/user-page.component.html | 10 +++++----- .../pages/users/user-page.component.ts | 14 ++++++-------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/frontend/app/features/administration/pages/users/user-page.component.html b/frontend/app/features/administration/pages/users/user-page.component.html index 5e314fcf6..afaa0a55b 100644 --- a/frontend/app/features/administration/pages/users/user-page.component.html +++ b/frontend/app/features/administration/pages/users/user-page.component.html @@ -45,14 +45,14 @@ - +
- +
@@ -61,7 +61,7 @@ - +
@@ -69,7 +69,7 @@ - +
@@ -78,7 +78,7 @@ - + diff --git a/frontend/app/features/administration/pages/users/user-page.component.ts b/frontend/app/features/administration/pages/users/user-page.component.ts index dcc115d66..e5b555d16 100644 --- a/frontend/app/features/administration/pages/users/user-page.component.ts +++ b/frontend/app/features/administration/pages/users/user-page.component.ts @@ -26,7 +26,7 @@ import { export class UserPageComponent extends ResourceOwner implements OnInit { public isEditable = true; - public user?: UserDto; + public user?: UserDto | null; public userForm = new UserForm(this.formBuilder); constructor( @@ -41,15 +41,13 @@ export class UserPageComponent extends ResourceOwner implements OnInit { public ngOnInit() { this.own( this.usersState.selectedUser - .subscribe(selectedUser => { - if (selectedUser) { - this.user = selectedUser; + .subscribe(user => { + this.user = user; - this.isEditable = this.user.canUpdate; + this.isEditable = !user || user.canUpdate; - this.userForm.load(selectedUser); - this.userForm.setEnabled(this.isEditable); - } + this.userForm.load(user || { permissions: [] }); + this.userForm.setEnabled(this.isEditable); })); }