paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-07-28 18:24:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix inherited permissions should not display per user in permissions form

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

44
src-ui/cypress/fixtures/documents/documents.json
View File

@@ -21,7 +21,16 @@
"original_file_name": "2022-03-22 no latin title.pdf",
"archived_file_name": "2022-03-22 no latin title.pdf",
"owner": null,
"permissions": [],
"permissions": {
"view": {
"users": [],
"groups": []
},
"change": {
"users": [],
"groups": []
}
},
"notes": [
{
"id": 9,
@@ -59,7 +68,16 @@
"original_file_name": "2022-03-23 lorem ipsum dolor sit amet.pdf",
"archived_file_name": "2022-03-23 llorem ipsum dolor sit amet.pdf",
"owner": null,
"permissions": [],
"permissions": {
"view": {
"users": [],
"groups": []
},
"change": {
"users": [],
"groups": []
}
},
"notes": []
},
{
@@ -80,7 +98,16 @@
"original_file_name": "2022-03-24 dolor.pdf",
"archived_file_name": "2022-03-24 dolor.pdf",
"owner": null,
"permissions": [],
"permissions": {
"view": {
"users": [],
"groups": []
},
"change": {
"users": [],
"groups": []
}
},
"notes": []
},
{
@@ -101,7 +128,16 @@
"original_file_name": "2022-06-01 sit amet.pdf",
"archived_file_name": "2022-06-01 sit amet.pdf",
"owner": null,
"permissions": [],
"permissions": {
"view": {
"users": [],
"groups": []
},
"change": {
"users": [],
"groups": []
}
},
"notes": []
}
]

3
src-ui/cypress/fixtures/ui_settings/settings.json
View File

@@ -2,7 +2,8 @@
"user": {
"id": 1,
"username": "admin",
"is_superuser": true
"is_superuser": true,
"groups": []
},
"settings": {
"language": "",

3
src-ui/cypress/fixtures/ui_settings/settings_restricted.json
View File

@@ -2,7 +2,8 @@
"user": {
"id": 1,
"username": "admin",
"is_superuser": false
"is_superuser": false,
"groups": []
},
"settings": {
"language": "",

2
src-ui/src/app/components/common/input/select/select.component.ts
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() {

2
src-ui/src/app/data/paperless-user.ts
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[]
}

11
src-ui/src/app/services/permissions.service.ts
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
)
}