]> git.ipfire.org Git - thirdparty/paperless-ngx.git/commitdiff
Merge branch 'dev' into feature-permissions
authorshamoon <4887959+shamoon@users.noreply.github.com>
Fri, 17 Feb 2023 04:44:51 +0000 (20:44 -0800)
committershamoon <4887959+shamoon@users.noreply.github.com>
Fri, 17 Feb 2023 04:44:51 +0000 (20:44 -0800)
1  2 
src-ui/src/app/components/manage/settings/settings.component.html
src-ui/src/app/components/manage/settings/settings.component.ts
src-ui/src/app/data/paperless-uisettings.ts
src/paperless/settings.py

index 01f455b7343430352af2f42908bf8f0819070900,e1575a831662512cee60d1760cef90a9702468ab..ee26073f8cca9be87d5dbe11491ce34fc2ac6d59
@@@ -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,
        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: {},
Simple merge