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

Hide delete button on detail page if no perms, fix error display & allow retry confirm button (#3020)

Browse Source
This commit is contained in:
shamoon 2023-04-04 16:16:17 -07:00 committed by GitHub
parent e58ba44e3d
commit f2fb06e6f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@
<div class="input-group-text" i18n>of {{previewNumPages}}</div> <div class="input-group-text" i18n>of {{previewNumPages}}</div>
</div> </div>
<button type="button" class="btn btn-sm btn-outline-danger me-2 ms-auto" (click)="delete()" [disabled]="!userIsOwner"> <button type="button" class="btn btn-sm btn-outline-danger me-2 ms-auto" (click)="delete()" [disabled]="!userIsOwner" *appIfPermissions="{ action: PermissionAction.Delete, type: PermissionType.Document }">
<svg class="buttonicon" fill="currentColor"> <svg class="buttonicon" fill="currentColor">
<use xlink:href="assets/bootstrap-icons.svg#trash" /> <use xlink:href="assets/bootstrap-icons.svg#trash" />
</svg><span class="d-none d-lg-inline ps-1" i18n>Delete</span> </svg><span class="d-none d-lg-inline ps-1" i18n>Delete</span>

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

@ -496,7 +496,7 @@ export class DocumentDetailComponent
this.toastService.showError( this.toastService.showError(
$localize`Error saving document` + $localize`Error saving document` +
': ' + ': ' +
(error.message ?? error.toString()) (error.error?.detail ?? error.message ?? JSON.stringify(error))
) )
} }
}, },
@ -541,7 +541,7 @@ export class DocumentDetailComponent
this.toastService.showError( this.toastService.showError(
$localize`Error saving document` + $localize`Error saving document` +
': ' + ': ' +
(error.message ?? error.toString()) (error.error?.detail ?? error.message ?? JSON.stringify(error))
) )
}, },
}) })
@ -573,6 +573,10 @@ export class DocumentDetailComponent
modal.componentInstance.message = $localize`The files for this document will be deleted permanently. This operation cannot be undone.` modal.componentInstance.message = $localize`The files for this document will be deleted permanently. This operation cannot be undone.`
modal.componentInstance.btnClass = 'btn-danger' modal.componentInstance.btnClass = 'btn-danger'
modal.componentInstance.btnCaption = $localize`Delete document` modal.componentInstance.btnCaption = $localize`Delete document`
this.subscribeModalDelete(modal) // so can be re-subscribed if error
}
subscribeModalDelete(modal) {
modal.componentInstance.confirmClicked modal.componentInstance.confirmClicked
.pipe( .pipe(
switchMap(() => { switchMap(() => {
@ -581,18 +585,21 @@ export class DocumentDetailComponent
}) })
) )
.pipe(takeUntil(this.unsubscribeNotifier)) .pipe(takeUntil(this.unsubscribeNotifier))
.subscribe( .subscribe({
() => { next: () => {
modal.close() modal.close()
this.close() this.close()
}, },
(error) => { error: (error) => {
this.toastService.showError( this.toastService.showError(
$localize`Error deleting document: ${JSON.stringify(error)}` $localize`Error deleting document: ${
error.error?.detail ?? error.message ?? JSON.stringify(error)
}`
) )
modal.componentInstance.buttonsEnabled = true modal.componentInstance.buttonsEnabled = true
} this.subscribeModalDelete(modal)
) },
})
} }
moreLike() { moreLike() {