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

Update filter-editor.component.ts

Browse Source 
[ci skip]
This commit is contained in:
shamoon 2025-03-17 14:36:40 -07:00
parent 87a4a96377
commit a823bd1e92
No known key found for this signature in database
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
View File

@ -818,18 +818,21 @@ export class FilterEditorComponent
}) })
}) })
} }
if (this.correspondentSelectionModel.isNoneSelected()) { if (
this.correspondentSelectionModel.isNoneSelected() &&
this.correspondentSelectionModel.intersection == Intersection.Include
) {
filterRules.push({ rule_type: FILTER_CORRESPONDENT, value: null })
} else {
if ( if (
this.correspondentSelectionModel.isNoneSelected() &&
this.correspondentSelectionModel.intersection == Intersection.Exclude this.correspondentSelectionModel.intersection == Intersection.Exclude
) { ) {
filterRules.push({ filterRules.push({
rule_type: FILTER_CORRESPONDENT, rule_type: FILTER_CORRESPONDENT,
value: NEGATIVE_NULL_FILTER_VALUE.toString(), value: NEGATIVE_NULL_FILTER_VALUE.toString(),
}) })
} else {
filterRules.push({ rule_type: FILTER_CORRESPONDENT, value: null })
} }
} else {
this.correspondentSelectionModel this.correspondentSelectionModel
.getSelectedItems() .getSelectedItems()
.forEach((correspondent) => { .forEach((correspondent) => {
@ -847,18 +850,21 @@ export class FilterEditorComponent
}) })
}) })
} }
if (this.documentTypeSelectionModel.isNoneSelected()) { if (
this.documentTypeSelectionModel.isNoneSelected() &&
this.documentTypeSelectionModel.intersection === Intersection.Include
) {
filterRules.push({ rule_type: FILTER_DOCUMENT_TYPE, value: null })
} else {
if ( if (
this.documentTypeSelectionModel.isNoneSelected() &&
this.documentTypeSelectionModel.intersection == Intersection.Exclude this.documentTypeSelectionModel.intersection == Intersection.Exclude
) { ) {
filterRules.push({ filterRules.push({
rule_type: FILTER_DOCUMENT_TYPE, rule_type: FILTER_DOCUMENT_TYPE,
value: NEGATIVE_NULL_FILTER_VALUE.toString(), value: NEGATIVE_NULL_FILTER_VALUE.toString(),
}) })
} else {
filterRules.push({ rule_type: FILTER_DOCUMENT_TYPE, value: null })
} }
} else {
this.documentTypeSelectionModel this.documentTypeSelectionModel
.getSelectedItems() .getSelectedItems()
.forEach((documentType) => { .forEach((documentType) => {
@ -876,16 +882,21 @@ export class FilterEditorComponent
}) })
}) })
} }
if (this.storagePathSelectionModel.isNoneSelected()) { if (
if (this.storagePathSelectionModel.intersection == Intersection.Exclude) { this.storagePathSelectionModel.isNoneSelected() &&
this.storagePathSelectionModel.intersection == Intersection.Include
) {
filterRules.push({ rule_type: FILTER_STORAGE_PATH, value: null })
} else {
if (
this.storagePathSelectionModel.isNoneSelected() &&
this.storagePathSelectionModel.intersection == Intersection.Exclude
) {
filterRules.push({ filterRules.push({
rule_type: FILTER_STORAGE_PATH, rule_type: FILTER_STORAGE_PATH,
value: NEGATIVE_NULL_FILTER_VALUE.toString(), value: NEGATIVE_NULL_FILTER_VALUE.toString(),
}) })
} else {
filterRules.push({ rule_type: FILTER_STORAGE_PATH, value: null })
} }
} else {
this.storagePathSelectionModel this.storagePathSelectionModel
.getSelectedItems() .getSelectedItems()
.forEach((storagePath) => { .forEach((storagePath) => {