]> git.ipfire.org Git - thirdparty/paperless-ngx.git/commitdiff
Load saved views from app frame, not dashboard 3211/head
authorshamoon <4887959+shamoon@users.noreply.github.com>
Thu, 27 Apr 2023 15:20:21 +0000 (08:20 -0700)
committershamoon <4887959+shamoon@users.noreply.github.com>
Thu, 27 Apr 2023 15:20:21 +0000 (08:20 -0700)
src-ui/src/app/components/app-frame/app-frame.component.ts
src-ui/src/app/components/dashboard/dashboard.component.ts

index 7167bce44b5f69844c55103f71ad98e2cc979476..24b7e8f230d855148ac04faed0f6e8ed3ced5af1 100644 (file)
@@ -27,6 +27,11 @@ import { ComponentCanDeactivate } from 'src/app/guards/dirty-doc.guard'
 import { SETTINGS_KEYS } from 'src/app/data/paperless-uisettings'
 import { ToastService } from 'src/app/services/toast.service'
 import { ComponentWithPermissions } from '../with-permissions/with-permissions.component'
+import {
+  PermissionAction,
+  PermissionsService,
+  PermissionType,
+} from 'src/app/services/permissions.service'
 
 @Component({
   selector: 'app-app-frame',
@@ -47,9 +52,19 @@ export class AppFrameComponent
     private list: DocumentListViewService,
     public settingsService: SettingsService,
     public tasksService: TasksService,
-    private readonly toastService: ToastService
+    private readonly toastService: ToastService,
+    private permissionsService: PermissionsService
   ) {
     super()
+
+    if (
+      permissionsService.currentUserCan(
+        PermissionAction.View,
+        PermissionType.SavedView
+      )
+    ) {
+      savedViewService.initialize()
+    }
   }
 
   ngOnInit(): void {
index 271e2cf14747d47e27cecbc9d76d908ba540124d..de3c5c969fd032bc4ed8f079fe2ce6e279f1809b 100644 (file)
@@ -1,9 +1,4 @@
 import { Component } from '@angular/core'
-import {
-  PermissionAction,
-  PermissionsService,
-  PermissionType,
-} from 'src/app/services/permissions.service'
 import { SavedViewService } from 'src/app/services/rest/saved-view.service'
 import { SettingsService } from 'src/app/services/settings.service'
 import { ComponentWithPermissions } from '../with-permissions/with-permissions.component'
@@ -16,19 +11,9 @@ import { ComponentWithPermissions } from '../with-permissions/with-permissions.c
 export class DashboardComponent extends ComponentWithPermissions {
   constructor(
     public settingsService: SettingsService,
-    private permissionsService: PermissionsService,
     public savedViewService: SavedViewService
   ) {
     super()
-
-    if (
-      permissionsService.currentUserCan(
-        PermissionAction.View,
-        PermissionType.SavedView
-      )
-    ) {
-      savedViewService.initialize()
-    }
   }
 
   get subtitle() {