From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Fri, 17 Feb 2023 04:44:51 +0000 (-0800)
Subject: Merge branch 'dev' into feature-permissions
X-Git-Tag: v1.14.0-beta.rc1~109^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3559e27cdd633770d80f2d8747e90866c35c171f;p=thirdparty%2Fpaperless-ngx.git

Merge branch 'dev' into feature-permissions
---

3559e27cdd633770d80f2d8747e90866c35c171f
diff --cc src-ui/src/app/components/manage/settings/settings.component.ts
index 01f455b734,e1575a8316..ee26073f8c
--- a/src-ui/src/app/components/manage/settings/settings.component.ts
+++ b/src-ui/src/app/components/manage/settings/settings.component.ts
@@@ -92,9 -83,8 +92,10 @@@ export class SettingsComponen
      notificationsConsumerSuccess: new FormControl(null),
      notificationsConsumerFailed: new FormControl(null),
      notificationsConsumerSuppressOnDashboard: new FormControl(null),
 +    usersGroup: this.usersGroup,
 +    groupsGroup: this.groupsGroup,
  
+     savedViewsWarnOnUnsavedChange: new FormControl(null),
      savedViews: this.savedViewGroup,
  
      mailAccounts: this.mailAccountGroup,
@@@ -211,8 -195,9 +212,11 @@@
        notificationsConsumerSuppressOnDashboard: this.settings.get(
          SETTINGS_KEYS.NOTIFICATIONS_CONSUMER_SUPPRESS_ON_DASHBOARD
        ),
+       savedViewsWarnOnUnsavedChange: this.settings.get(
+         SETTINGS_KEYS.SAVED_VIEWS_WARN_ON_UNSAVED_CHANGE
+       ),
 +      usersGroup: {},
 +      groupsGroup: {},
        savedViews: {},
        mailAccounts: {},
        mailRules: {},