paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-10-30 03:56:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

front end client support for filtering for no correspondent/document type

Browse Source
This commit is contained in:
jonaswinkler
2020-12-25 19:06:12 +01:00
parent f7f78d80b7
commit b9cf517cd1
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src-ui/src/app/data/filter-rule-type.ts
View File

@@ -25,8 +25,8 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [
{id: FILTER_ASN, name: "ASN is", filtervar: "archive_serial_number", datatype: "number", multi: false}, {id: FILTER_ASN, name: "ASN is", filtervar: "archive_serial_number", datatype: "number", multi: false},
{id: FILTER_CORRESPONDENT, name: "Correspondent is", filtervar: "correspondent__id", datatype: "correspondent", multi: false}, {id: FILTER_CORRESPONDENT, name: "Correspondent is", filtervar: "correspondent__id", isnull_filtervar: "correspondent__isnull", datatype: "correspondent", multi: false},
{id: FILTER_DOCUMENT_TYPE, name: "Document type is", filtervar: "document_type__id", datatype: "document_type", multi: false}, {id: FILTER_DOCUMENT_TYPE, name: "Document type is", filtervar: "document_type__id", isnull_filtervar: "document_type__isnull", datatype: "document_type", multi: false},
{id: FILTER_IS_IN_INBOX, name: "Is in Inbox", filtervar: "is_in_inbox", datatype: "boolean", multi: false, default: true}, {id: FILTER_IS_IN_INBOX, name: "Is in Inbox", filtervar: "is_in_inbox", datatype: "boolean", multi: false, default: true},
{id: FILTER_HAS_TAG, name: "Has tag", filtervar: "tags__id__all", datatype: "tag", multi: true}, {id: FILTER_HAS_TAG, name: "Has tag", filtervar: "tags__id__all", datatype: "tag", multi: true},
@@ -51,6 +51,7 @@ export interface FilterRuleType {
id: number id: number
name: string name: string
filtervar: string filtervar: string
isnull_filtervar?: string
datatype: string //number, string, boolean, date datatype: string //number, string, boolean, date
multi: boolean multi: boolean
default?: any default?: any

2
src-ui/src/app/services/rest/document.service.ts
View File

@@ -38,6 +38,8 @@ export class DocumentService extends AbstractPaperlessService<PaperlessDocument>
let ruleType = FILTER_RULE_TYPES.find(t => t.id == rule.rule_type) let ruleType = FILTER_RULE_TYPES.find(t => t.id == rule.rule_type)
if (ruleType.multi) { if (ruleType.multi) {
params[ruleType.filtervar] = params[ruleType.filtervar] ? params[ruleType.filtervar] + "," + rule.value : rule.value params[ruleType.filtervar] = params[ruleType.filtervar] ? params[ruleType.filtervar] + "," + rule.value : rule.value
} else if (ruleType.isnull_filtervar && rule.value == null) {
params[ruleType.isnull_filtervar] = true
} else { } else {
params[ruleType.filtervar] = rule.value params[ruleType.filtervar] = rule.value
} }