From 79ae594d5427c20bff400a595bcfcca975d1350d Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Sun, 16 Mar 2025 08:31:27 -0700 Subject: [PATCH 1/5] Fix: fix saving docs with notes --- src/documents/serialisers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index 5a87092b8..782f4d6c8 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -870,7 +870,7 @@ class BasicUserSerializer(serializers.ModelSerializer): class NotesSerializer(serializers.ModelSerializer): - user = BasicUserSerializer() + user = BasicUserSerializer(read_only=True) class Meta: model = Note @@ -893,7 +893,7 @@ class DocumentSerializer( created_date = serializers.DateField(required=False) page_count = SerializerMethodField() - notes = NotesSerializer(many=True, required=False) + notes = NotesSerializer(many=True, required=False, read_only=True) custom_fields = CustomFieldInstanceSerializer( many=True, From d1a3e3b859246f031dce87b66a6683a2b177a09b Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 21 Mar 2025 00:44:37 -0700 Subject: [PATCH 2/5] Fix: top nav layout with custom title on very narrow screens --- .../app/components/app-frame/app-frame.component.html | 2 +- .../app/components/app-frame/app-frame.component.scss | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html index b3d515274..ff80288aa 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.html +++ b/src-ui/src/app/components/app-frame/app-frame.component.html @@ -15,7 +15,7 @@
@if (customAppTitle?.length) { -
+
{{customAppTitle}} by Paperless-ngx
diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss index 1ad42ca28..774f841e1 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.scss +++ b/src-ui/src/app/components/app-frame/app-frame.component.scss @@ -244,7 +244,7 @@ main { } } -@media screen and (max-width: 768px) { +@media screen and (min-width: 366px) and (max-width: 768px) { .navbar-toggler { // compensate for 2 buttons on the right margin-right: 45px; @@ -257,6 +257,13 @@ main { } } +@media screen and (max-width: 345px) { + .custom-title { + max-width: 102px; + overflow: hidden; + } +} + :host ::ng-deep .dropdown.show .dropdown-toggle, :host ::ng-deep .dropdown-toggle:hover { opacity: 0.7; From 1c89f6da248ad713f71ed10ae62ef496376f5fd9 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 21 Mar 2025 00:52:28 -0700 Subject: [PATCH 3/5] More narrow device tweaks --- src-ui/src/app/components/app-frame/app-frame.component.scss | 2 +- src-ui/src/theme.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss index 774f841e1..e493f369d 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.scss +++ b/src-ui/src/app/components/app-frame/app-frame.component.scss @@ -259,7 +259,7 @@ main { @media screen and (max-width: 345px) { .custom-title { - max-width: 102px; + max-width: 110px; overflow: hidden; } } diff --git a/src-ui/src/theme.scss b/src-ui/src/theme.scss index cc60d3851..eacc3b4e7 100644 --- a/src-ui/src/theme.scss +++ b/src-ui/src/theme.scss @@ -24,7 +24,7 @@ --pngx-bg-alt2: var(--bs-gray-200); // #e9ecef --pngx-bg-disabled: #f7f7f7; --pngx-focus-alpha: 0.3; - --pngx-toast-max-width: 360px; + --pngx-toast-max-width: 340px; --bs-info: var(--pngx-bg-alt2); --bs-info-rgb: 233, 236, 239; @media screen and (min-width: 1024px) { From 92524ae97a327290e73859656357508e88e6d599 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 21 Mar 2025 09:52:06 -0700 Subject: [PATCH 4/5] Chore: remove a couple of console logs --- .../filterable-dropdown/filterable-dropdown.component.spec.ts | 2 -- src-ui/src/app/services/settings.service.ts | 3 --- 2 files changed, 5 deletions(-) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.spec.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.spec.ts index cd279b1b5..06bc18b0c 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.spec.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.spec.ts @@ -492,11 +492,9 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () => component.selectionModel.items = items component.selectionModel = selectionModel component.selectionModel.intersection = Intersection.Include - console.log(component.selectionModel.items[0]) component.selectionModel.set(null, ToggleableItemState.Selected) component.selectionModel.intersection = Intersection.Exclude component.selectionModel.toggleIntersection() - console.log(component.selectionModel) expect(component.selectionModel.getExcludedItems()).toEqual([ negativeNullItem, ]) diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts index 80e3b3474..454ddc04a 100644 --- a/src-ui/src/app/services/settings.service.ts +++ b/src-ui/src/app/services/settings.service.ts @@ -602,7 +602,6 @@ export class SettingsService { ) } catch (error) { this.toastService.showError(errorMessage) - console.log(error) } this.storeSettings() @@ -614,7 +613,6 @@ export class SettingsService { }, error: (e) => { this.toastService.showError(errorMessage) - console.log(e) }, }) } @@ -636,7 +634,6 @@ export class SettingsService { this.toastService.showError( 'Error migrating update checking setting' ) - console.log(e) }, }) } From 7a07f1e81ddf826476a2add2f1262661f7daad03 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 21 Mar 2025 10:28:20 -0700 Subject: [PATCH 5/5] Remove unnecessary check --- .../components/document-detail/document-detail.component.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts index ba3b76bc3..00e34fe93 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.ts +++ b/src-ui/src/app/components/document-detail/document-detail.component.ts @@ -825,10 +825,6 @@ export class DocumentDetailComponent error: (error) => { this.networkActive = false const canEdit = - this.permissionsService.currentUserCan( - PermissionAction.Change, - PermissionType.Document - ) && this.permissionsService.currentUserHasObjectPermissions( PermissionAction.Change, this.document