diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 434a06c1c..2b22142ee 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -345,10 +345,6 @@ src/app/app.component.ts 172 - - src/app/components/manage/mail/mail.component.html - 4 - Workflows give you more control over the document pipeline. @@ -363,10 +359,6 @@ src/app/app.component.ts 188 - - src/app/components/admin/tasks/tasks.component.html - 4 - Check out the settings for various tweaks to the web app and toggle settings for saved views. @@ -400,25 +392,25 @@ Application Configuration src/app/components/admin/config/config.component.html - 2 + 1 - - Global app configuration options which apply to <strong>every</strong> user of this install of Paperless-ngx. Options can also be set using environment variables or the configuration file but the value here will always take precedence. + + Global Paperless-ngx configuration options src/app/components/admin/config/config.component.html - 4 + 1 src/app/components/admin/config/config.component.html - 14,15 + 8,9 src/app/components/admin/tasks/tasks.component.html - 16 + 11 src/app/components/common/input/tags/tags.component.html @@ -433,21 +425,21 @@ Read the documentation about this setting src/app/components/admin/config/config.component.html - 25 + 19 Enable src/app/components/admin/config/config.component.html - 36 + 30 Discard src/app/components/admin/config/config.component.html - 55 + 49 src/app/components/document-detail/document-detail.component.html @@ -458,11 +450,11 @@ Save src/app/components/admin/config/config.component.html - 58 + 52 src/app/components/admin/settings/settings.component.html - 342 + 337 src/app/components/common/edit-dialog/correspondent-edit-dialog/correspondent-edit-dialog.component.html @@ -563,7 +555,7 @@ Logs src/app/components/admin/logs/logs.component.html - 2 + 1 src/app/components/app-frame/app-frame.component.html @@ -574,45 +566,38 @@ 324 - - Review the log files for the application and for email checking. - - src/app/components/admin/logs/logs.component.html - 4 - - Auto refresh src/app/components/admin/logs/logs.component.html - 8 + 4 src/app/components/admin/tasks/tasks.component.html - 20 + 15 Loading... src/app/components/admin/logs/logs.component.html - 24 + 20 src/app/components/admin/logs/logs.component.html - 36 + 32 src/app/components/admin/settings/settings.component.html - 330 + 325 src/app/components/admin/tasks/tasks.component.html - 27 + 22 src/app/components/admin/users-groups/users-groups.component.html - 108 + 102 src/app/components/common/edit-dialog/mail-account-edit-dialog/mail-account-edit-dialog.component.html @@ -644,7 +629,7 @@ src/app/components/manage/mail/mail.component.html - 119 + 113 src/app/components/manage/management-list/management-list.component.html @@ -667,11 +652,11 @@ Settings src/app/components/admin/settings/settings.component.html - 2 + 1 src/app/components/admin/settings/settings.component.html - 289 + 284 src/app/components/app-frame/app-frame.component.html @@ -686,235 +671,228 @@ 281 - - Options to customize appearance, notifications, saved views and more. Settings apply to the <strong>current user only</strong>. - - src/app/components/admin/settings/settings.component.html - 4 - - Start tour src/app/components/admin/settings/settings.component.html - 7 + 2 Open Django Admin src/app/components/admin/settings/settings.component.html - 9 + 4 General src/app/components/admin/settings/settings.component.html - 20 + 15 Appearance src/app/components/admin/settings/settings.component.html - 23 + 18 Display language src/app/components/admin/settings/settings.component.html - 27 + 22 You need to reload the page after applying a new language. src/app/components/admin/settings/settings.component.html - 40 + 35 Date display src/app/components/admin/settings/settings.component.html - 48 + 43 Date format src/app/components/admin/settings/settings.component.html - 65 + 60 Short: src/app/components/admin/settings/settings.component.html - 71,72 + 66,67 Medium: src/app/components/admin/settings/settings.component.html - 75,76 + 70,71 Long: src/app/components/admin/settings/settings.component.html - 79,80 + 74,75 Items per page src/app/components/admin/settings/settings.component.html - 87 + 82 Document editor src/app/components/admin/settings/settings.component.html - 103 + 98 Use PDF viewer provided by the browser src/app/components/admin/settings/settings.component.html - 107 + 102 This is usually faster for displaying large PDF documents, but it might not work on some browsers. src/app/components/admin/settings/settings.component.html - 107 + 102 Sidebar src/app/components/admin/settings/settings.component.html - 114 + 109 Use 'slim' sidebar (icons only) src/app/components/admin/settings/settings.component.html - 118 + 113 Dark mode src/app/components/admin/settings/settings.component.html - 125 + 120 Use system settings src/app/components/admin/settings/settings.component.html - 128 + 123 Enable dark mode src/app/components/admin/settings/settings.component.html - 129 + 124 Invert thumbnails in dark mode src/app/components/admin/settings/settings.component.html - 130 + 125 Theme Color src/app/components/admin/settings/settings.component.html - 136 + 131 Reset src/app/components/admin/settings/settings.component.html - 145 + 140 Update checking src/app/components/admin/settings/settings.component.html - 150 + 145 Update checking works by pinging the public GitHub API for the latest release to determine whether a new version is available. Actual updating of the app must still be performed manually. src/app/components/admin/settings/settings.component.html - 154,157 + 149,152 No tracking data is collected by the app in any way. src/app/components/admin/settings/settings.component.html - 159,161 + 154,156 Enable update checking src/app/components/admin/settings/settings.component.html - 161 + 156 Bulk editing src/app/components/admin/settings/settings.component.html - 165 + 160 Show confirmation dialogs src/app/components/admin/settings/settings.component.html - 169 + 164 Deleting documents will always ask for confirmation. src/app/components/admin/settings/settings.component.html - 169 + 164 Apply on close src/app/components/admin/settings/settings.component.html - 170 + 165 Notes src/app/components/admin/settings/settings.component.html - 174 + 169 src/app/components/document-list/document-list.component.html @@ -929,14 +907,14 @@ Enable notes src/app/components/admin/settings/settings.component.html - 178 + 173 Permissions src/app/components/admin/settings/settings.component.html - 186 + 181 src/app/components/common/edit-dialog/group-edit-dialog/group-edit-dialog.component.html @@ -964,11 +942,11 @@ src/app/components/manage/mail/mail.component.html - 44 + 38 src/app/components/manage/mail/mail.component.html - 97 + 91 src/app/components/manage/management-list/management-list.component.html @@ -991,28 +969,28 @@ Default Permissions src/app/components/admin/settings/settings.component.html - 189 + 184 Settings apply to this user account for objects (Tags, Mail Rules, etc.) created via the web UI src/app/components/admin/settings/settings.component.html - 193,195 + 188,190 Default Owner src/app/components/admin/settings/settings.component.html - 200 + 195 Objects without an owner can be viewed and edited by all users src/app/components/admin/settings/settings.component.html - 204 + 199 src/app/components/common/input/permissions/permissions-form/permissions-form.component.html @@ -1023,18 +1001,18 @@ Default View Permissions src/app/components/admin/settings/settings.component.html - 209 + 204 Users: src/app/components/admin/settings/settings.component.html - 214 + 209 src/app/components/admin/settings/settings.component.html - 241 + 236 src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html @@ -1057,11 +1035,11 @@ Groups: src/app/components/admin/settings/settings.component.html - 224 + 219 src/app/components/admin/settings/settings.component.html - 251 + 246 src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html @@ -1084,14 +1062,14 @@ Default Edit Permissions src/app/components/admin/settings/settings.component.html - 236 + 231 Edit permissions also grant viewing permissions src/app/components/admin/settings/settings.component.html - 260 + 255 src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html @@ -1106,56 +1084,56 @@ Notifications src/app/components/admin/settings/settings.component.html - 268 + 263 Document processing src/app/components/admin/settings/settings.component.html - 271 + 266 Show notifications when new documents are detected src/app/components/admin/settings/settings.component.html - 275 + 270 Show notifications when document processing completes successfully src/app/components/admin/settings/settings.component.html - 276 + 271 Show notifications when document processing fails src/app/components/admin/settings/settings.component.html - 277 + 272 Suppress notifications on dashboard src/app/components/admin/settings/settings.component.html - 278 + 273 This will suppress all messages about document processing status on the dashboard. src/app/components/admin/settings/settings.component.html - 278 + 273 Saved views src/app/components/admin/settings/settings.component.html - 286 + 281 src/app/components/app-frame/app-frame.component.html @@ -1166,14 +1144,14 @@ Show warning when closing saved views with unsaved changes src/app/components/admin/settings/settings.component.html - 292 + 287 Views src/app/components/admin/settings/settings.component.html - 296 + 291 src/app/components/document-list/document-list.component.html @@ -1184,19 +1162,19 @@ Name src/app/components/admin/settings/settings.component.html - 302 + 297 src/app/components/admin/tasks/tasks.component.html - 40 + 35 src/app/components/admin/users-groups/users-groups.component.html - 24 + 18 src/app/components/admin/users-groups/users-groups.component.html - 69 + 63 src/app/components/common/edit-dialog/correspondent-edit-dialog/correspondent-edit-dialog.component.html @@ -1240,15 +1218,15 @@ src/app/components/manage/custom-fields/custom-fields.component.html - 20 + 14 src/app/components/manage/mail/mail.component.html - 23 + 17 src/app/components/manage/mail/mail.component.html - 76 + 70 src/app/components/manage/management-list/management-list.component.html @@ -1284,21 +1262,21 @@ src/app/components/manage/workflows/workflows.component.html - 20 + 14  Appears on src/app/components/admin/settings/settings.component.html - 306,307 + 301,302 Show on dashboard src/app/components/admin/settings/settings.component.html - 309 + 304 src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html @@ -1309,7 +1287,7 @@ Show in sidebar src/app/components/admin/settings/settings.component.html - 313 + 308 src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html @@ -1320,19 +1298,19 @@ Actions src/app/components/admin/settings/settings.component.html - 317 + 312 src/app/components/admin/tasks/tasks.component.html - 46 + 41 src/app/components/admin/users-groups/users-groups.component.html - 26 + 20 src/app/components/admin/users-groups/users-groups.component.html - 72 + 66 src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html @@ -1348,15 +1326,15 @@ src/app/components/manage/custom-fields/custom-fields.component.html - 22 + 16 src/app/components/manage/mail/mail.component.html - 25 + 19 src/app/components/manage/mail/mail.component.html - 78 + 72 src/app/components/manage/management-list/management-list.component.html @@ -1376,22 +1354,22 @@ src/app/components/manage/workflows/workflows.component.html - 24 + 18 Delete src/app/components/admin/settings/settings.component.html - 318 + 313 src/app/components/admin/users-groups/users-groups.component.html - 45 + 39 src/app/components/admin/users-groups/users-groups.component.html - 91 + 85 src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.ts @@ -1423,15 +1401,15 @@ src/app/components/manage/custom-fields/custom-fields.component.html - 41 + 35 src/app/components/manage/mail/mail.component.html - 49 + 43 src/app/components/manage/mail/mail.component.html - 102 + 96 src/app/components/manage/management-list/management-list.component.html @@ -1471,14 +1449,14 @@ src/app/components/manage/workflows/workflows.component.html - 45 + 39 No saved views defined. src/app/components/admin/settings/settings.component.html - 324 + 319 @@ -1567,7 +1545,7 @@ File Tasks src/app/components/admin/tasks/tasks.component.html - 2 + 1 src/app/components/app-frame/app-frame.component.html @@ -1578,7 +1556,7 @@ Clear selection src/app/components/admin/tasks/tasks.component.html - 11 + 6 src/app/components/manage/management-list/management-list.component.html @@ -1601,7 +1579,7 @@ Created src/app/components/admin/tasks/tasks.component.html - 41 + 36 src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html @@ -1624,28 +1602,28 @@ Results src/app/components/admin/tasks/tasks.component.html - 43 + 38 Info src/app/components/admin/tasks/tasks.component.html - 45 + 40 click for full output src/app/components/admin/tasks/tasks.component.html - 76 + 71 Dismiss src/app/components/admin/tasks/tasks.component.html - 93 + 88 src/app/components/admin/tasks/tasks.component.ts @@ -1656,14 +1634,21 @@ Open Document src/app/components/admin/tasks/tasks.component.html - 100 + 95 {VAR_PLURAL, plural, =1 {One task} other { total tasks}} src/app/components/admin/tasks/tasks.component.html - 118 + 114 + + + +  ( selected) + + src/app/components/admin/tasks/tasks.component.html + 116 @@ -1754,7 +1739,7 @@ Users & Groups src/app/components/admin/users-groups/users-groups.component.html - 2 + 1 src/app/components/app-frame/app-frame.component.html @@ -1765,18 +1750,11 @@ 299 - - Create, delete and edit users and groups. - - src/app/components/admin/users-groups/users-groups.component.html - 4 - - Users src/app/components/admin/users-groups/users-groups.component.html - 12 + 6 src/app/components/common/permissions-filter-dropdown/permissions-filter-dropdown.component.html @@ -1787,14 +1765,14 @@ Add User src/app/components/admin/users-groups/users-groups.component.html - 17 + 11 Username src/app/components/admin/users-groups/users-groups.component.html - 23 + 17 src/app/components/common/edit-dialog/mail-account-edit-dialog/mail-account-edit-dialog.component.html @@ -1809,11 +1787,11 @@ Groups src/app/components/admin/users-groups/users-groups.component.html - 25 + 19 src/app/components/admin/users-groups/users-groups.component.html - 57 + 51 src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.html @@ -1824,11 +1802,11 @@ Edit src/app/components/admin/users-groups/users-groups.component.html - 40 + 34 src/app/components/admin/users-groups/users-groups.component.html - 86 + 80 src/app/components/common/input/permissions/permissions-form/permissions-form.component.html @@ -1848,15 +1826,15 @@ src/app/components/manage/custom-fields/custom-fields.component.html - 36 + 30 src/app/components/manage/mail/mail.component.html - 39 + 33 src/app/components/manage/mail/mail.component.html - 92 + 86 src/app/components/manage/management-list/management-list.component.html @@ -1892,21 +1870,21 @@ src/app/components/manage/workflows/workflows.component.html - 40 + 34 Add Group src/app/components/admin/users-groups/users-groups.component.html - 62 + 56 No groups defined src/app/components/admin/users-groups/users-groups.component.html - 99 + 93 @@ -2291,7 +2269,7 @@ src/app/components/manage/custom-fields/custom-fields.component.html - 2 + 1 @@ -2306,7 +2284,7 @@ src/app/components/manage/workflows/workflows.component.html - 2 + 1 @@ -2893,7 +2871,7 @@ src/app/components/manage/mail/mail.component.html - 77 + 71 @@ -3378,7 +3356,7 @@ src/app/components/manage/workflows/workflows.component.html - 21 + 15 @@ -3389,7 +3367,7 @@ src/app/components/manage/workflows/workflows.component.html - 33 + 27 @@ -3400,7 +3378,7 @@ src/app/components/manage/workflows/workflows.component.html - 23 + 17 @@ -3909,20 +3887,6 @@ 16 - - What's this? - - src/app/components/common/page-header/page-header.component.html - 9 - - - - Read more - - src/app/components/common/page-header/page-header.component.html - 17 - - Set permissions @@ -4246,7 +4210,7 @@ src/app/components/manage/workflows/workflows.component.html - 22 + 16 @@ -5853,32 +5817,25 @@ 67 - - Customize the data fields that can be attached to documents. - - src/app/components/manage/custom-fields/custom-fields.component.html - 4 - - Add Field src/app/components/manage/custom-fields/custom-fields.component.html - 12 + 6 Data Type src/app/components/manage/custom-fields/custom-fields.component.html - 21 + 15 No fields defined. src/app/components/manage/custom-fields/custom-fields.component.html - 49 + 43 @@ -5934,56 +5891,56 @@ Mail Settings src/app/components/manage/mail/mail.component.html - 2 + 1 Mail accounts src/app/components/manage/mail/mail.component.html - 12 + 6 Add Account src/app/components/manage/mail/mail.component.html - 17 + 11 Server src/app/components/manage/mail/mail.component.html - 24 + 18 No mail accounts defined. src/app/components/manage/mail/mail.component.html - 57 + 51 Mail rules src/app/components/manage/mail/mail.component.html - 65 + 59 Add Rule src/app/components/manage/mail/mail.component.html - 70 + 64 No mail rules defined. src/app/components/manage/mail/mail.component.html - 110 + 104 @@ -6329,32 +6286,25 @@ 53 - - Use workflows to customize the behavior of Paperless-ngx when events 'trigger' a workflow. - - src/app/components/manage/workflows/workflows.component.html - 4 - - Add Workflow src/app/components/manage/workflows/workflows.component.html - 12 + 6 Disabled src/app/components/manage/workflows/workflows.component.html - 33 + 27 No workflows defined. src/app/components/manage/workflows/workflows.component.html - 53 + 47 diff --git a/src-ui/src/app/components/admin/tasks/tasks.component.html b/src-ui/src/app/components/admin/tasks/tasks.component.html index 81dd2e47e..52d85cc8e 100644 --- a/src-ui/src/app/components/admin/tasks/tasks.component.html +++ b/src-ui/src/app/components/admin/tasks/tasks.component.html @@ -8,153 +8,158 @@ - -
- - -
- - +  Clear selection + + +
+ + +
+ + - @if (!tasksService.completedFileTasks && tasksService.loading) { -
-
Loading...
- } +@if (!tasksService.completedFileTasks && tasksService.loading) { +
+
Loading...
+} - - - - - - - - @if (activeTab !== 'started' && activeTab !== 'queued') { - - } - - - - - - @for (task of tasks | slice: (page-1) * pageSize : page * pageSize; track task) { - - - - - @if (activeTab !== 'started' && activeTab !== 'queued') { - - } - - - - - - - } - -
-
- - -
-
NameCreatedResultsInfoActions
-
- - -
-
{{ task.task_file_name }}{{ task.date_created | customDate:'short' }} - @if (task.result?.length > 50) { -
- {{ task.result | slice:0:50 }}… -
- } - @if (task.result?.length <= 50) { - {{ task.result }} - } - -
{{ task.result | slice:0:300 }}@if (task.result.length > 300) {
-                      …
-                    }
- @if (task.result?.length > 300) { -
(click for full output) - } -
-
- - -
- - - @if (task.related_document) { - - } - -
-
-
{{ task.result }}
-
- -
- @if (tasks.length > 0) { -
{tasks.length, plural, =1 {One {{this.activeTabLocalized}} task} other {{{tasks.length || 0}} total {{this.activeTabLocalized}} tasks}}
- } - @if (tasks.length > pageSize) { - - } + + + + + + + + @if (activeTab !== 'started' && activeTab !== 'queued') { + + } + + + + + + @for (task of tasks | slice: (page-1) * pageSize : page * pageSize; track task) { + + + + + @if (activeTab !== 'started' && activeTab !== 'queued') { + + } + + + + + + + } + +
+
+ +
- +
NameCreatedResultsInfoActions
+
+ + +
+
{{ task.task_file_name }}{{ task.date_created | customDate:'short' }} + @if (task.result?.length > 50) { +
+ {{ task.result | slice:0:50 }}… +
+ } + @if (task.result?.length <= 50) { + {{ task.result }} + } + +
{{ task.result | slice:0:300 }}@if (task.result.length > 300) {
+                  …
+                }
+ @if (task.result?.length > 300) { +
(click for full output) + } +
+
+ + +
+ + + @if (task.related_document) { + + } + +
+
+
{{ task.result }}
+
- -
+
+ @if (tasks.length > 0) { +
+ {tasks.length, plural, =1 {One {{this.activeTabLocalized}} task} other {{{tasks.length || 0}} total {{this.activeTabLocalized}} tasks}} + @if (selectedTasks.size > 0) { +  ({{selectedTasks.size}} selected) + } +
+ } + @if (tasks.length > pageSize) { + + } +
+
+ + +
diff --git a/src/documents/filters.py b/src/documents/filters.py index bab20a4dc..b760b9779 100644 --- a/src/documents/filters.py +++ b/src/documents/filters.py @@ -114,6 +114,8 @@ class SharedByUser(Filter): ctype = ContentType.objects.get_for_model(self.model) UserObjectPermission = get_user_obj_perms_model() GroupObjectPermission = get_group_obj_perms_model() + # see https://github.com/paperless-ngx/paperless-ngx/issues/5392, we limit subqueries + # to 1 because Postgres doesn't like returning > 1 row, but all we care about is > 0 return ( qs.filter( owner_id=value, @@ -123,7 +125,7 @@ class SharedByUser(Filter): UserObjectPermission.objects.filter( content_type=ctype, object_pk=Cast(OuterRef("pk"), CharField()), - ).values("user_id"), + ).values("user_id")[:1], ), ) .annotate( @@ -131,7 +133,7 @@ class SharedByUser(Filter): GroupObjectPermission.objects.filter( content_type=ctype, object_pk=Cast(OuterRef("pk"), CharField()), - ).values("group_id"), + ).values("group_id")[:1], ), ) .filter(