diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 8f2b8b786..329399584 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -1039,81 +1039,95 @@
106
+
+ Title
+
+ src/app/components/document-list/filter-editor/filter-editor.component.ts
+ 73
+
+
+
+ Title & content
+
+ src/app/components/document-list/filter-editor/filter-editor.component.ts
+ 74
+
+
Correspondent:
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 29
+ 32
Without correspondent
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 31
+ 34
Type:
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 36
+ 39
Without document type
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 38
+ 41
Tag:
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 42
+ 45
Without any tag
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 46
+ 49
Title:
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 50
+ 53
Filter tags
src/app/components/document-list/filter-editor/filter-editor.component.html
- 12
+ 20
Filter correspondents
src/app/components/document-list/filter-editor/filter-editor.component.html
- 20
+ 28
Filter document types
src/app/components/document-list/filter-editor/filter-editor.component.html
- 27
+ 35
Reset filters
src/app/components/document-list/filter-editor/filter-editor.component.html
- 50
+ 58
@@ -1819,13 +1833,6 @@
18
-
- Title
-
- src/app/services/rest/document.service.ts
- 19
-
-
Document type
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
index 033596f53..7290354eb 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
@@ -2,7 +2,15 @@
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
index a6506efde..3ac9df1ff 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
@@ -8,10 +8,13 @@ import { DocumentTypeService } from 'src/app/services/rest/document-type.service
import { TagService } from 'src/app/services/rest/tag.service';
import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
import { FilterRule } from 'src/app/data/filter-rule';
-import { FILTER_ADDED_AFTER, FILTER_ADDED_BEFORE, FILTER_CORRESPONDENT, FILTER_CREATED_AFTER, FILTER_CREATED_BEFORE, FILTER_DOCUMENT_TYPE, FILTER_HAS_ANY_TAG, FILTER_HAS_TAG, FILTER_TITLE } from 'src/app/data/filter-rule-type';
+import { FILTER_ADDED_AFTER, FILTER_ADDED_BEFORE, FILTER_CORRESPONDENT, FILTER_CREATED_AFTER, FILTER_CREATED_BEFORE, FILTER_DOCUMENT_TYPE, FILTER_HAS_ANY_TAG, FILTER_HAS_TAG, FILTER_TITLE, FILTER_TITLE_CONTENT } from 'src/app/data/filter-rule-type';
import { FilterableDropdownSelectionModel } from '../../common/filterable-dropdown/filterable-dropdown.component';
import { ToggleableItemState } from '../../common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component';
+const TEXT_FILTER_TARGET_TITLE = "title"
+const TEXT_FILTER_TARGET_TITLE_CONTENT = "title-content"
+
@Component({
selector: 'app-filter-editor',
templateUrl: './filter-editor.component.html',
@@ -64,7 +67,19 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
correspondents: PaperlessCorrespondent[] = []
documentTypes: PaperlessDocumentType[] = []
- _titleFilter = ""
+ _textFilter = ""
+
+ textFilterTargets = [
+ {id: TEXT_FILTER_TARGET_TITLE, name: $localize`Title`},
+ {id: TEXT_FILTER_TARGET_TITLE_CONTENT, name: $localize`Title & content`}
+ ]
+
+ textFilterTarget = TEXT_FILTER_TARGET_TITLE_CONTENT
+
+ get textFilterTargetName() {
+ return this.textFilterTargets.find(t => t.id == this.textFilterTarget)?.name
+ }
+
tagSelectionModel = new FilterableDropdownSelectionModel()
correspondentSelectionModel = new FilterableDropdownSelectionModel()
@@ -80,7 +95,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
this.documentTypeSelectionModel.clear(false)
this.tagSelectionModel.clear(false)
this.correspondentSelectionModel.clear(false)
- this._titleFilter = null
+ this._textFilter = null
this.dateAddedBefore = null
this.dateAddedAfter = null
this.dateCreatedBefore = null
@@ -89,7 +104,12 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
value.forEach(rule => {
switch (rule.rule_type) {
case FILTER_TITLE:
- this._titleFilter = rule.value
+ this._textFilter = rule.value
+ this.textFilterTarget = TEXT_FILTER_TARGET_TITLE
+ break
+ case FILTER_TITLE_CONTENT:
+ this._textFilter = rule.value
+ this.textFilterTarget = TEXT_FILTER_TARGET_TITLE_CONTENT
break
case FILTER_CREATED_AFTER:
this.dateCreatedAfter = rule.value
@@ -121,8 +141,11 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
get filterRules(): FilterRule[] {
let filterRules: FilterRule[] = []
- if (this._titleFilter) {
- filterRules.push({rule_type: FILTER_TITLE, value: this._titleFilter})
+ if (this._textFilter && this.textFilterTarget == TEXT_FILTER_TARGET_TITLE_CONTENT) {
+ filterRules.push({rule_type: FILTER_TITLE_CONTENT, value: this._textFilter})
+ }
+ if (this._textFilter && this.textFilterTarget == TEXT_FILTER_TARGET_TITLE) {
+ filterRules.push({rule_type: FILTER_TITLE, value: this._textFilter})
}
if (this.tagSelectionModel.isNoneSelected()) {
filterRules.push({rule_type: FILTER_HAS_ANY_TAG, value: "false"})
@@ -165,15 +188,15 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
this.filterRulesChange.next(this.filterRules)
}
- get titleFilter() {
- return this._titleFilter
+ get textFilter() {
+ return this._textFilter
}
- set titleFilter(value) {
- this.titleFilterDebounce.next(value)
+ set textFilter(value) {
+ this.textFilterDebounce.next(value)
}
- titleFilterDebounce: Subject
+ textFilterDebounce: Subject
subscription: Subscription
ngOnInit() {
@@ -181,19 +204,19 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
this.correspondentService.listAll().subscribe(result => this.correspondents = result.results)
this.documentTypeService.listAll().subscribe(result => this.documentTypes = result.results)
- this.titleFilterDebounce = new Subject()
+ this.textFilterDebounce = new Subject()
- this.subscription = this.titleFilterDebounce.pipe(
+ this.subscription = this.textFilterDebounce.pipe(
debounceTime(400),
distinctUntilChanged()
- ).subscribe(title => {
- this._titleFilter = title
+ ).subscribe(text => {
+ this._textFilter = text
this.updateRules()
})
}
ngOnDestroy() {
- this.titleFilterDebounce.complete()
+ this.textFilterDebounce.complete()
}
resetSelected() {
@@ -223,4 +246,9 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
onDocumentTypeDropdownOpen() {
this.documentTypeSelectionModel.apply()
}
+
+ changeTextFilterTarget(target) {
+ this.textFilterTarget = target
+ this.updateRules()
+ }
}
diff --git a/src-ui/src/app/data/filter-rule-type.ts b/src-ui/src/app/data/filter-rule-type.ts
index 4669b548e..2c9f8a373 100644
--- a/src-ui/src/app/data/filter-rule-type.ts
+++ b/src-ui/src/app/data/filter-rule-type.ts
@@ -20,6 +20,8 @@ export const FILTER_DOES_NOT_HAVE_TAG = 17
export const FILTER_ASN_ISNULL = 18
+export const FILTER_TITLE_CONTENT = 19
+
export const FILTER_RULE_TYPES: FilterRuleType[] = [
{id: FILTER_TITLE, filtervar: "title__icontains", datatype: "string", multi: false, default: ""},
@@ -47,7 +49,9 @@ export const FILTER_RULE_TYPES: FilterRuleType[] = [
{id: FILTER_MODIFIED_BEFORE, filtervar: "modified__date__lt", datatype: "date", multi: false},
{id: FILTER_MODIFIED_AFTER, filtervar: "modified__date__gt", datatype: "date", multi: false},
- {id: FILTER_ASN_ISNULL, filtervar: "archive_serial_number__isnull", datatype: "boolean", multi: false}
+ {id: FILTER_ASN_ISNULL, filtervar: "archive_serial_number__isnull", datatype: "boolean", multi: false},
+
+ {id: FILTER_TITLE_CONTENT, filtervar: "title_content", datatype: "string", multi: false}
]
export interface FilterRuleType {
diff --git a/src/documents/filters.py b/src/documents/filters.py
index 2201298f3..a1ad94b1e 100755
--- a/src/documents/filters.py
+++ b/src/documents/filters.py
@@ -1,3 +1,4 @@
+from django.db.models import Q
from django_filters.rest_framework import BooleanFilter, FilterSet, Filter
from .models import Correspondent, Document, Tag, DocumentType, Log
@@ -70,6 +71,16 @@ class InboxFilter(Filter):
return qs
+class TitleContentFilter(Filter):
+
+ def filter(self, qs, value):
+ if value:
+ return qs.filter(Q(title__icontains=value) |
+ Q(content__icontains=value))
+ else:
+ return qs
+
+
class DocumentFilterSet(FilterSet):
is_tagged = BooleanFilter(
@@ -85,6 +96,8 @@ class DocumentFilterSet(FilterSet):
is_in_inbox = InboxFilter()
+ title_content = TitleContentFilter()
+
class Meta:
model = Document
fields = {
diff --git a/src/documents/migrations/1014_auto_20210228_1614.py b/src/documents/migrations/1014_auto_20210228_1614.py
new file mode 100644
index 000000000..cb716fa82
--- /dev/null
+++ b/src/documents/migrations/1014_auto_20210228_1614.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.1.7 on 2021-02-28 15:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('documents', '1013_migrate_tag_colour'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='savedviewfilterrule',
+ name='rule_type',
+ field=models.PositiveIntegerField(choices=[(0, 'title contains'), (1, 'content contains'), (2, 'ASN is'), (3, 'correspondent is'), (4, 'document type is'), (5, 'is in inbox'), (6, 'has tag'), (7, 'has any tag'), (8, 'created before'), (9, 'created after'), (10, 'created year is'), (11, 'created month is'), (12, 'created day is'), (13, 'added before'), (14, 'added after'), (15, 'modified before'), (16, 'modified after'), (17, 'does not have tag'), (18, 'does not have ASN'), (19, 'title or content contains')], verbose_name='rule type'),
+ ),
+ ]
diff --git a/src/documents/models.py b/src/documents/models.py
index 3d81efea4..6ee93e3ad 100755
--- a/src/documents/models.py
+++ b/src/documents/models.py
@@ -385,6 +385,8 @@ class SavedViewFilterRule(models.Model):
(15, _("modified before")),
(16, _("modified after")),
(17, _("does not have tag")),
+ (18, _("does not have ASN")),
+ (19, _("title or content contains")),
]
saved_view = models.ForeignKey(