paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-02 13:45:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Change toggle all, fix multiple group inheritance, fix select dark mode display

Browse Source
This commit is contained in:
Michael Shamoon 2022-12-05 15:51:53 -08:00
parent bb8a0d26e2
commit b1a4eec7be
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,9 +66,12 @@ export class UserEditDialogComponent
}
get inheritedPermissions(): string[] {
const groupsVal = this.objectForm.get('groups').value
return groupsVal !== null
? this.groups.find((g) => g.id == groupsVal)?.permissions
: []
const groupsVal: Array<number> = this.objectForm.get('groups').value
if (!groupsVal) return []
else
return groupsVal.flatMap(
(id) => this.groups.find((g) => g.id == id)?.permissions
)
}
}

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

@ -145,6 +145,9 @@ export class PermissionsSelectComponent
})
this.typesWithAllActions.add(type)
} else {
Object.keys(PermissionAction).forEach((action) => {
typeGroup.get(action).patchValue(false)
})
this.typesWithAllActions.delete(type)
}
}

13
src-ui/src/theme.scss
View File

@ -157,6 +157,19 @@ $form-check-radio-checked-bg-image-dark: url("data:image/svg+xml,<svg xmlns='htt
background-color: var(--bs-light);
}
.ng-select-multiple .ng-select-container .ng-value-container .ng-value {
background-color: var(--pngx-bg-alt);
color: var(--bs-body-color);
.ng-value-icon.left {
border-color: var(--pngx-bg-alt);
&:hover {
background-color: var(--pngx-primary-lighten-30);
}
}
}
table {
.des,
.asc {