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

Fix: document link field consistent behavior with insufficient permissions (#7953)

Browse Source
This commit is contained in:
shamoon 2024-10-17 14:31:24 -07:00
parent de95b296a0
commit f0ad073bb2
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src-ui/src/app/components/common/input/document-link/document-link.component.html
View File

@ -40,7 +40,7 @@
(change)="onChange(selectedDocuments)"> (change)="onChange(selectedDocuments)">
<ng-template ng-label-tmp let-document="item"> <ng-template ng-label-tmp let-document="item">
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<button class="btn p-0 lh-1" (click)="unselect(document)" title="Remove link" i18n-title><i-bs name="x"></i-bs></button> <button class="btn p-0 lh-1" [disabled]="disabled" (click)="unselect(document)" title="Remove link" i18n-title><i-bs name="x"></i-bs></button>
<a routerLink="/documents/{{document.id}}" class="badge bg-light text-primary" (mousedown)="$event.stopImmediatePropagation();" title="Open link" i18n-title> <a routerLink="/documents/{{document.id}}" class="badge bg-light text-primary" (mousedown)="$event.stopImmediatePropagation();" title="Open link" i18n-title>
<i-bs width="0.9em" height="0.9em" name="file-text"></i-bs>&nbsp;<span>{{document.title}}</span> <i-bs width="0.9em" height="0.9em" name="file-text"></i-bs>&nbsp;<span>{{document.title}}</span>
</a> </a>

14
src-ui/src/app/components/common/input/document-link/document-link.component.scss
View File

@ -3,7 +3,19 @@
.ng-value { .ng-value {
background-color: transparent !important; background-color: transparent !important;
border-color: transparent; border-color: transparent !important;
}
}
.paperless-input-select.disabled {
--bs-btn-disabled-border-color: transparent;
::ng-deep ng-select {
.ng-select-container {
div, .ng-arrow-wrapper, input {
cursor: not-allowed;
}
background-color: var(--pngx-bg-alt) !important;
}
} }
} }

2
src-ui/src/app/components/document-detail/document-detail.component.html
View File

@ -344,8 +344,8 @@
@if (!hasNext()) { @if (!hasNext()) {
<button type="button" class="order-2 btn btn-sm btn-outline-primary" (click)="save(true)" i18n [disabled]="!userCanEdit || networkActive || (isDirty$ | async) !== true">Save &amp; close</button> <button type="button" class="order-2 btn btn-sm btn-outline-primary" (click)="save(true)" i18n [disabled]="!userCanEdit || networkActive || (isDirty$ | async) !== true">Save &amp; close</button>
} }
<button type="button" class="order-0 btn btn-sm btn-outline-secondary" (click)="discard()" i18n [disabled]="!userCanEdit || networkActive || (isDirty$ | async) !== true">Discard</button>
</ng-container> </ng-container>
<button type="button" class="order-0 btn btn-sm btn-outline-secondary" (click)="discard()" i18n [disabled]="!userCanEdit || networkActive || (isDirty$ | async) !== true">Discard</button>
</div> </div>
</ng-template> </ng-template>

10
src-ui/src/app/components/document-detail/document-detail.component.ts
View File

@ -1020,10 +1020,14 @@ export class DocumentDetailComponent
} }
return ( return (
!this.document || !this.document ||
this.permissionsService.currentUserHasObjectPermissions( (this.permissionsService.currentUserCan(
PermissionAction.Change, PermissionAction.Change,
doc PermissionType.Document
) ) &&
this.permissionsService.currentUserHasObjectPermissions(
PermissionAction.Change,
doc
))
) )
} }