From 9c9f95b0d7662d81145098d01a53f5c247bd069a Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Mon, 23 Sep 2024 11:51:38 -0700
Subject: [PATCH] Another merge conflict, translation strings
---
src-ui/messages.xlf | 289 +++++++++++++-----
.../filter-editor/filter-editor.component.ts | 16 +-
2 files changed, 216 insertions(+), 89 deletions(-)
diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index 201cb5faa..590cff745 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -698,7 +698,7 @@
src/app/components/common/input/document-link/document-link.component.html
- 38
+ 50
src/app/components/common/permissions-dialog/permissions-dialog.component.html
@@ -1031,7 +1031,7 @@
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 143
+ 152
@@ -1088,7 +1088,7 @@
src/app/components/document-list/filter-editor/filter-editor.component.html
- 110
+ 105
src/app/components/manage/mail/mail.component.html
@@ -3300,6 +3300,102 @@
63
+
+ True
+
+ src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.html
+ 40
+
+
+ src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.html
+ 72
+
+
+ src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.html
+ 78
+
+
+
+ False
+
+ src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.html
+ 41
+
+
+ src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.html
+ 73
+
+
+ src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.html
+ 79
+
+
+
+ Search docs...
+
+ src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.html
+ 95
+
+
+
+ Any
+
+ src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.html
+ 124
+
+
+ src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
+ 17
+
+
+
+ All
+
+ src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.html
+ 126
+
+
+ src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
+ 15
+
+
+ src/app/components/common/permissions-filter-dropdown/permissions-filter-dropdown.component.html
+ 16
+
+
+ src/app/components/common/permissions-select/permissions-select.component.html
+ 16
+
+
+ src/app/components/common/permissions-select/permissions-select.component.html
+ 27
+
+
+ src/app/components/document-list/bulk-editor/bulk-editor.component.html
+ 14
+
+
+
+ Not
+
+ src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.html
+ 129
+
+
+
+ Add query
+
+ src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.html
+ 148
+
+
+
+ Add expression
+
+ src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.html
+ 151
+
+
now
@@ -4541,36 +4637,6 @@
146
-
- All
-
- src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
- 15
-
-
- src/app/components/common/permissions-filter-dropdown/permissions-filter-dropdown.component.html
- 16
-
-
- src/app/components/common/permissions-select/permissions-select.component.html
- 16
-
-
- src/app/components/common/permissions-select/permissions-select.component.html
- 27
-
-
- src/app/components/document-list/bulk-editor/bulk-editor.component.html
- 14
-
-
-
- Any
-
- src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
- 17
-
-
Include
@@ -4660,7 +4726,7 @@
src/app/components/common/input/document-link/document-link.component.html
- 9
+ 12
src/app/components/common/input/file/file.component.html
@@ -4732,14 +4798,14 @@
Remove link
src/app/components/common/input/document-link/document-link.component.html
- 30
+ 42
Open link
src/app/components/common/input/document-link/document-link.component.html
- 31
+ 43
src/app/components/common/input/url/url.component.html
@@ -4753,6 +4819,13 @@
44
+
+ Search for documents
+
+ src/app/components/common/input/document-link/document-link.component.ts
+ 53
+
+
Selected items
@@ -5822,7 +5895,7 @@
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 131
+ 140
src/app/data/document.ts
@@ -6404,7 +6477,7 @@
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 139
+ 148
@@ -6413,10 +6486,6 @@
src/app/components/document-list/bulk-editor/bulk-editor.component.html
83
-
- src/app/components/document-list/filter-editor/filter-editor.component.html
- 90
-
Merge
@@ -6902,7 +6971,7 @@
src/app/components/document-list/filter-editor/filter-editor.component.html
- 116
+ 111
@@ -6927,7 +6996,7 @@
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 136
+ 145
src/app/data/document.ts
@@ -7077,161 +7146,154 @@
Dates
src/app/components/document-list/filter-editor/filter-editor.component.html
- 100
+ 95
Title & content
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 134
+ 143
More like
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 149
+ 158
equals
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 155
+ 164
is empty
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 159
+ 168
is not empty
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 163
+ 172
greater than
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 167
+ 176
less than
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 171
+ 180
Correspondent:
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 191,193
+ 200,202
Without correspondent
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 195
+ 204
Document type:
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 201,203
+ 210,212
Without document type
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 205
+ 214
Storage path:
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 211,213
+ 220,222
Without storage path
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 215
+ 224
Tag:
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 219,221
+ 228,230
Without any tag
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 225
+ 234
-
- Custom fields:
+
+ Custom fields query
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 229,231
-
-
-
- Without any custom field
-
- src/app/components/document-list/filter-editor/filter-editor.component.ts
- 235
+ 238
Title:
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 239
+ 241
ASN:
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 242
+ 244
Owner:
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 245
+ 247
Owner not in:
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 248
+ 250
Without an owner
src/app/components/document-list/filter-editor/filter-editor.component.ts
- 251
+ 253
@@ -7912,6 +7974,83 @@
9
+
+ Equal to
+
+ src/app/data/custom-field-query.ts
+ 24
+
+
+
+ In
+
+ src/app/data/custom-field-query.ts
+ 25
+
+
+
+ Is null
+
+ src/app/data/custom-field-query.ts
+ 26
+
+
+
+ Exists
+
+ src/app/data/custom-field-query.ts
+ 27
+
+
+
+ Contains
+
+ src/app/data/custom-field-query.ts
+ 28
+
+
+
+ Contains (case-insensitive)
+
+ src/app/data/custom-field-query.ts
+ 29
+
+
+
+ Greater than
+
+ src/app/data/custom-field-query.ts
+ 30
+
+
+
+ Greater than or equal to
+
+ src/app/data/custom-field-query.ts
+ 31
+
+
+
+ Less than
+
+ src/app/data/custom-field-query.ts
+ 32
+
+
+
+ Less than or equal to
+
+ src/app/data/custom-field-query.ts
+ 33
+
+
+
+ Range
+
+ src/app/data/custom-field-query.ts
+ 34
+
+
Boolean
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 14680cc2a..b7723f6f0 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
@@ -234,20 +234,8 @@ export class FilterEditorComponent
return $localize`Without any tag`
}
- case FILTER_HAS_CUSTOM_FIELDS_ANY:
- return $localize`Custom fields include: ${
- this.customFields.find((f) => f.id == +rule.value)?.name
- }`
-
- case FILTER_HAS_CUSTOM_FIELDS_ALL:
- return $localize`Custom fields: ${
- this.customFields.find((f) => f.id == +rule.value)?.name
- }`
-
- case FILTER_HAS_ANY_CUSTOM_FIELDS:
- if (rule.value == 'false') {
- return $localize`Without any custom field`
- }
+ case FILTER_CUSTOM_FIELDS_LOOKUP:
+ return $localize`Custom fields query`
case FILTER_TITLE:
return $localize`Title: ${rule.value}`