paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-05-01 11:19:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix superuser initial disable individual perms, permissions select setup

Browse Source
This commit is contained in:
Michael Shamoon 2022-12-05 13:23:08 -08:00
parent 94eadc76b5
commit aa47d1eb1f
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.ts
View File

@ -13,7 +13,10 @@ import { UserService } from 'src/app/services/rest/user.service'
templateUrl: './user-edit-dialog.component.html', templateUrl: './user-edit-dialog.component.html',
styleUrls: ['./user-edit-dialog.component.scss'], styleUrls: ['./user-edit-dialog.component.scss'],
}) })
export class UserEditDialogComponent extends EditDialogComponent<PaperlessUser> { export class UserEditDialogComponent
extends EditDialogComponent<PaperlessUser>
implements OnInit
{
groups: PaperlessGroup[] groups: PaperlessGroup[]
constructor( constructor(
@ -29,6 +32,11 @@ export class UserEditDialogComponent extends EditDialogComponent<PaperlessUser>
.subscribe((result) => (this.groups = result.results)) .subscribe((result) => (this.groups = result.results))
} }
ngOnInit(): void {
super.ngOnInit()
this.onToggleSuperUser()
}
getCreateTitle() { getCreateTitle() {
return $localize`Create new user account` return $localize`Create new user account`
} }

5
src-ui/src/app/components/common/permissions-select/permissions-select.component.ts
View File

@ -64,8 +64,9 @@ export class PermissionsSelectComponent
} }
writeValue(permissions: string[]): void { writeValue(permissions: string[]): void {
this.permissions = permissions this.permissions = permissions ?? []
const allPerms = this._inheritedPermissions.concat(permissions) const allPerms = this._inheritedPermissions.concat(this.permissions)
allPerms.forEach((permissionStr) => { allPerms.forEach((permissionStr) => {
const { actionKey, typeKey } = const { actionKey, typeKey } =
this.permissionsService.getPermissionKeys(permissionStr) this.permissionsService.getPermissionKeys(permissionStr)

2
src-ui/src/app/components/manage/settings/settings.component.html
View File

@ -344,7 +344,7 @@
<div class="row"> <div class="row">
<div class="col d-flex align-items-center"><button class="btn btn-link p-0" type="button" (click)="editUser(user)">{{user.username}}</button></div> <div class="col d-flex align-items-center"><button class="btn btn-link p-0" type="button" (click)="editUser(user)">{{user.username}}</button></div>
<div class="col d-flex align-items-center">{{user.first_name}} {{user.last_name}}</div> <div class="col d-flex align-items-center">{{user.first_name}} {{user.last_name}}</div>
<div class="col d-flex align-items-center">{{user.groups?.map(getGroupName, this)}}</div> <div class="col d-flex align-items-center">{{user.groups?.map(getGroupName, this).join(', ')}}</div>
<div class="col"> <div class="col">
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-sm btn-primary" type="button" (click)="editUser(user)" i18n>Edit</button> <button class="btn btn-sm btn-primary" type="button" (click)="editUser(user)" i18n>Edit</button>