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

Merge pull request #2205 from paperless-ngx/fix-2204

Browse Source 
Fix: support `tags__id__none` in advanced search, fix tags filter badge count for excluded
This commit is contained in:
shamoon 2022-12-23 16:27:50 -08:00 committed by GitHub
commit 5435dc2499
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
View File

@ -4,7 +4,7 @@
<use attr.xlink:href="assets/bootstrap-icons.svg#{{icon}}" /> <use attr.xlink:href="assets/bootstrap-icons.svg#{{icon}}" />
</svg> </svg>
<div class="d-none d-sm-inline">&nbsp;{{title}}</div> <div class="d-none d-sm-inline">&nbsp;{{title}}</div>
<ng-container *ngIf="!editing && selectionModel.selectionSize() > 0"> <ng-container *ngIf="!editing && selectionModel.totalCount > 0">
<app-clearable-badge [number]="multiple ? selectionModel.totalCount : undefined" [selected]="!multiple && selectionModel.selectionSize() > 0" (cleared)="reset()"></app-clearable-badge> <app-clearable-badge [number]="multiple ? selectionModel.totalCount : undefined" [selected]="!multiple && selectionModel.selectionSize() > 0" (cleared)="reset()"></app-clearable-badge>
</ng-container> </ng-container>
</button> </button>

3
src/documents/index.py
View File

@ -143,6 +143,9 @@ class DelayedQuery:
elif k == "tags__id__all": elif k == "tags__id__all":
for tag_id in v.split(","): for tag_id in v.split(","):
criterias.append(query.Term("tag_id", tag_id)) criterias.append(query.Term("tag_id", tag_id))
elif k == "tags__id__none":
for tag_id in v.split(","):
criterias.append(query.Not(query.Term("tag_id", tag_id)))
elif k == "document_type__id": elif k == "document_type__id":
criterias.append(query.Term("type_id", v)) criterias.append(query.Term("type_id", v))
elif k == "correspondent__isnull": elif k == "correspondent__isnull":