Fix inherited permissions should not display per user in permissions form

This commit is contained in:
shamoon
2023-03-17 20:49:47 -07:00
parent 4cfc416cdc
commit ae0c585918
9 changed files with 58 additions and 11 deletions

View File

@@ -77,7 +77,7 @@ export class SelectComponent extends AbstractInputComponent<number> {
}
get isPrivate(): boolean {
return this.items.find((i) => i.id === this.value)?.private
return this.items?.find((i) => i.id === this.value)?.private
}
getSuggestions() {

View File

@@ -9,7 +9,7 @@ export interface PaperlessUser extends ObjectWithId {
is_staff?: boolean
is_active?: boolean
is_superuser?: boolean
groups?: PaperlessGroup[]
groups?: number[] // PaperlessGroup[]
user_permissions?: string[]
inherited_permissions?: string[]
}

View File

@@ -58,11 +58,16 @@ export class PermissionsService {
action: string,
object: ObjectWithPermissions
): boolean {
let actionObject = null
if (action === PermissionAction.View) actionObject = object.permissions.view
else if (action === PermissionAction.Change)
actionObject = object.permissions.change
if (!actionObject) return false
return (
this.currentUserOwnsObject(object) ||
(object.permissions[action]['users'] as Array<number>)?.includes(
this.currentUser.id
)
actionObject.users.includes(this.currentUser.id) ||
actionObject.groups.filter((g) => this.currentUser.groups.includes(g))
.length > 0
)
}