forks/peertube
1
0
Fork 0
Code Releases Activity

Fix welcome modal when saving config

Browse source
This commit is contained in:
Chocobozzz 2019-11-27 10:29:05 +01:00
parent 918058dea3
commit 414131338d
No known key found for this signature in database
GPG key ID: 583A612D890159BE
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
client/src/app/app.component.ts
View file

@ -4,7 +4,7 @@ import { Event, GuardsCheckStart, NavigationEnd, Router, Scroll } from '@angular
import { AuthService, RedirectService, ServerService, ThemeService } from '@app/core' import { AuthService, RedirectService, ServerService, ThemeService } from '@app/core'
import { is18nPath } from '../../../shared/models/i18n' import { is18nPath } from '../../../shared/models/i18n'
import { ScreenService } from '@app/shared/misc/screen.service' import { ScreenService } from '@app/shared/misc/screen.service'
import { debounceTime, filter, map, pairwise, skip, switchMap } from 'rxjs/operators' import { debounceTime, filter, first, map, pairwise, skip, switchMap } from 'rxjs/operators'
import { Hotkey, HotkeysService } from 'angular2-hotkeys' import { Hotkey, HotkeysService } from 'angular2-hotkeys'
import { I18n } from '@ngx-translate/i18n-polyfill' import { I18n } from '@ngx-translate/i18n-polyfill'
import { fromEvent } from 'rxjs' import { fromEvent } from 'rxjs'
@ -234,6 +234,7 @@ export class AppComponent implements OnInit {
private async openModalsIfNeeded () { private async openModalsIfNeeded () {
this.serverService.configLoaded this.serverService.configLoaded
.pipe( .pipe(
first(),
switchMap(() => this.authService.userInformationLoaded), switchMap(() => this.authService.userInformationLoaded),
map(() => this.authService.getUser()), map(() => this.authService.getUser()),
filter(user => user.role === UserRole.ADMINISTRATOR) filter(user => user.role === UserRole.ADMINISTRATOR)