]> git.ipfire.org Git - thirdparty/paperless-ngx.git/commitdiff
Merge branch 'dev' into feature-permissions
authorMichael Shamoon <4887959+shamoon@users.noreply.github.com>
Mon, 2 Jan 2023 01:51:41 +0000 (17:51 -0800)
committerMichael Shamoon <4887959+shamoon@users.noreply.github.com>
Mon, 2 Jan 2023 01:51:41 +0000 (17:51 -0800)
1  2 
src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.ts
src-ui/src/app/components/common/input/tags/tags.component.ts
src-ui/src/app/components/document-detail/document-detail.component.ts
src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html
src-ui/src/app/components/manage/management-list/management-list.component.ts
src-ui/src/app/components/manage/settings/settings.component.ts
src/documents/tests/test_api.py
src/documents/views.py

index ba661304a70f8eb54c85339b37d20ac5c96105a2,aef47b605d36d4eb98ee559ff2fc7f960c19b4ce..e7bdc8d75419d2661d520ea2e397b84f953a219d
        <app-filterable-dropdown class="me-2 me-md-3" title="Correspondent" icon="person-fill" i18n-title
          filterPlaceholder="Filter correspondents" i18n-filterPlaceholder
          [items]="correspondents"
 +        [disabled]="!userCanEditAll"
          [editing]="true"
          [applyOnClose]="applyOnClose"
-         (open)="openCorrespondentDropdown()"
+         (opened)="openCorrespondentDropdown()"
          [(selectionModel)]="correspondentSelectionModel"
          (apply)="setCorrespondents($event)">
        </app-filterable-dropdown>
        <app-filterable-dropdown class="me-2 me-md-3" title="Document type" icon="file-earmark-fill" i18n-title
          filterPlaceholder="Filter document types" i18n-filterPlaceholder
          [items]="documentTypes"
 +        [disabled]="!userCanEditAll"
          [editing]="true"
          [applyOnClose]="applyOnClose"
-         (open)="openDocumentTypeDropdown()"
+         (opened)="openDocumentTypeDropdown()"
          [(selectionModel)]="documentTypeSelectionModel"
          (apply)="setDocumentTypes($event)">
        </app-filterable-dropdown>
        <app-filterable-dropdown class="me-2 me-md-3" title="Storage path" icon="folder-fill" i18n-title
          filterPlaceholder="Filter storage paths" i18n-filterPlaceholder
          [items]="storagePaths"
 +        [disabled]="!userCanEditAll"
          [editing]="true"
          [applyOnClose]="applyOnClose"
-         (open)="openStoragePathDropdown()"
+         (opened)="openStoragePathDropdown()"
          [(selectionModel)]="storagePathsSelectionModel"
          (apply)="setStoragePaths($event)">
        </app-filterable-dropdown>
Simple merge
index ac6f19c19c159e47ef749628a3c190db8b657a4d,e313ae17ea79c57bfcbb69815d2fbb8214adac37..734a2e8ac5b64b17a5433273946a53e704974b7d
@@@ -669,10 -626,9 +669,10 @@@ class PostDocumentView(GenericAPIView)
              override_tag_ids=tag_ids,
              task_id=task_id,
              override_created=created,
 +            override_owner_id=owner_id,
          )
  
-         return Response("OK")
+         return Response(async_task.id)
  
  
  class SelectionDataView(GenericAPIView):