paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-09 09:58:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

tap ui settings get to avoid dup

Browse Source
This commit is contained in:
Michael Shamoon 2022-05-17 16:12:59 -07:00
parent 4a7c9a6050
commit 89c5aac9ed
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src-ui/src/app/app.module.ts
View File

@ -87,7 +87,6 @@ import localeSr from '@angular/common/locales/sr'
import localeSv from '@angular/common/locales/sv' import localeSv from '@angular/common/locales/sv'
import localeTr from '@angular/common/locales/tr' import localeTr from '@angular/common/locales/tr'
import localeZh from '@angular/common/locales/zh' import localeZh from '@angular/common/locales/zh'
import { Observable } from 'rxjs'
import { SettingsService } from './services/settings.service' import { SettingsService } from './services/settings.service'
registerLocaleData(localeBe) registerLocaleData(localeBe)

17
src-ui/src/app/services/settings.service.ts
View File

@ -10,7 +10,7 @@ import {
} from '@angular/core' } from '@angular/core'
import { Meta } from '@angular/platform-browser' import { Meta } from '@angular/platform-browser'
import { CookieService } from 'ngx-cookie-service' import { CookieService } from 'ngx-cookie-service'
import { first, Observable } from 'rxjs' import { first, Observable, tap } from 'rxjs'
import { import {
BRIGHTNESS, BRIGHTNESS,
estimateBrightnessForColor, estimateBrightnessForColor,
@ -60,13 +60,14 @@ export class SettingsService {
// this is called by the app initializer in app.module // this is called by the app initializer in app.module
public initializeSettings(): Observable<PaperlessUiSettings> { public initializeSettings(): Observable<PaperlessUiSettings> {
let settings$ = this.http.get<PaperlessUiSettings>(this.baseUrl) return this.http.get<PaperlessUiSettings>(this.baseUrl).pipe(
settings$.pipe(first()).subscribe((uisettings) => { first(),
Object.assign(this.settings, uisettings.settings) tap((uisettings) => {
this.maybeMigrateSettings() Object.assign(this.settings, uisettings.settings)
this.displayName = uisettings.display_name.trim() this.maybeMigrateSettings()
}) this.displayName = uisettings.display_name.trim()
return settings$ })
)
} }
public updateAppearanceSettings( public updateAppearanceSettings(