diff --git a/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.ts index 6b3943f80..52a4ef55c 100644 --- a/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.ts +++ b/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.ts @@ -13,7 +13,10 @@ import { UserService } from 'src/app/services/rest/user.service' templateUrl: './user-edit-dialog.component.html', styleUrls: ['./user-edit-dialog.component.scss'], }) -export class UserEditDialogComponent extends EditDialogComponent { +export class UserEditDialogComponent + extends EditDialogComponent + implements OnInit +{ groups: PaperlessGroup[] constructor( @@ -29,6 +32,11 @@ export class UserEditDialogComponent extends EditDialogComponent .subscribe((result) => (this.groups = result.results)) } + ngOnInit(): void { + super.ngOnInit() + this.onToggleSuperUser() + } + getCreateTitle() { return $localize`Create new user account` } diff --git a/src-ui/src/app/components/common/permissions-select/permissions-select.component.ts b/src-ui/src/app/components/common/permissions-select/permissions-select.component.ts index abb8a2742..d69e7fb31 100644 --- a/src-ui/src/app/components/common/permissions-select/permissions-select.component.ts +++ b/src-ui/src/app/components/common/permissions-select/permissions-select.component.ts @@ -64,8 +64,9 @@ export class PermissionsSelectComponent } writeValue(permissions: string[]): void { - this.permissions = permissions - const allPerms = this._inheritedPermissions.concat(permissions) + this.permissions = permissions ?? [] + const allPerms = this._inheritedPermissions.concat(this.permissions) + allPerms.forEach((permissionStr) => { const { actionKey, typeKey } = this.permissionsService.getPermissionKeys(permissionStr) diff --git a/src-ui/src/app/components/manage/settings/settings.component.html b/src-ui/src/app/components/manage/settings/settings.component.html index b557f687a..72a995fe9 100644 --- a/src-ui/src/app/components/manage/settings/settings.component.html +++ b/src-ui/src/app/components/manage/settings/settings.component.html @@ -344,7 +344,7 @@
{{user.first_name}} {{user.last_name}}
-
{{user.groups?.map(getGroupName, this)}}
+
{{user.groups?.map(getGroupName, this).join(', ')}}