Better migration of update checking settings, offer reload, strip backend_setting from db

This commit is contained in:
Michael Shamoon
2022-09-30 14:03:59 -07:00
parent 4eaeac3610
commit f0cd10e960
6 changed files with 43 additions and 32 deletions

View File

@@ -209,5 +209,5 @@
<div [ngbNavOutlet]="nav" class="border-start border-end border-bottom p-3 mb-3 shadow-sm"></div>
<button type="submit" class="btn btn-primary" [disabled]="!(isDirty$ | async)" i18n>Save</button>
<button type="submit" class="btn btn-primary mb-2" [disabled]="!(isDirty$ | async)" i18n>Save</button>
</form>

View File

@@ -67,13 +67,6 @@ export class SettingsComponent
)
}
get displayLanguageIsDirty(): boolean {
return (
this.settingsForm.get('displayLanguage').value !=
this.store?.getValue()['displayLanguage']
)
}
constructor(
public savedViewService: SavedViewService,
private documentListViewService: DocumentListViewService,
@@ -197,7 +190,13 @@ export class SettingsComponent
}
private saveLocalSettings() {
const reloadRequired = this.displayLanguageIsDirty // just this one, for now
const reloadRequired =
this.settingsForm.value.displayLanguage !=
this.store?.getValue()['displayLanguage'] || // displayLanguage is dirty
(this.settingsForm.value.updateCheckingEnabled !=
this.store?.getValue()['updateCheckingEnabled'] &&
this.settingsForm.value.updateCheckingEnabled) // update checking was turned on
this.settings.set(
SETTINGS_KEYS.BULK_EDIT_APPLY_ON_CLOSE,
this.settingsForm.value.bulkEditApplyOnClose