Unify merge and merge_and_delete_originals

2024-06-07 16:34:37 +02:00
parent ef9d1b5188
commit 236213ed2b
6 changed files with 29 additions and 23 deletions
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts
@@ -813,13 +813,11 @@ export class BulkEditorComponent
        if (mergeDialog.metadataDocumentID > -1) {
          args['metadata_document_id'] = mergeDialog.metadataDocumentID
        }
+        if (mergeDialog.deleteOriginals) {
+          args['delete_originals'] = true
+        }
        mergeDialog.buttonsEnabled = false
-        this.executeBulkOperation(
-          modal,
-          mergeDialog.deleteOriginals ? 'merge_and_delete_originals' : 'merge',
-          args,
-          mergeDialog.documentIDs
-        )
+        this.executeBulkOperation(modal, 'merge', args, mergeDialog.documentIDs)
        this.toastService.showInfo(
          $localize`Merged document will be queued for consumption.`
        )