paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2026-02-09 23:49:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ok lets just merge it all together

Browse Source
This commit is contained in:
shamoon
2026-02-06 20:56:03 -08:00
parent 9d7231d2dc
commit 145c11394b
13 changed files with 506 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src-ui/src/app/guards/permissions.guard.ts
View File

@@ -20,12 +20,20 @@ export class PermissionsGuard {
route: ActivatedRouteSnapshot,
state: RouterStateSnapshot
): boolean | UrlTree {
const requiredPermissionAny: { action: any; type: any }[] =
route.data.requiredPermissionAny
if (
(route.data.requireAdmin && !this.permissionsService.isAdmin()) ||
(route.data.requiredPermission &&
!this.permissionsService.currentUserCan(
route.data.requiredPermission.action,
route.data.requiredPermission.type
)) ||
(Array.isArray(requiredPermissionAny) &&
requiredPermissionAny.length > 0 &&
!requiredPermissionAny.some((p) =>
this.permissionsService.currentUserCan(p.action, p.type)
))
) {
// Check if tour is running 1 = TourState.ON