diff options
Diffstat (limited to 'client/src/app/+my-library')
-rw-r--r-- | client/src/app/+my-library/+my-video-channels/my-video-channel-update.component.ts | 8 | ||||
-rw-r--r-- | client/src/app/+my-library/my-library.component.ts | 9 |
2 files changed, 7 insertions, 10 deletions
diff --git a/client/src/app/+my-library/+my-video-channels/my-video-channel-update.component.ts b/client/src/app/+my-library/+my-video-channels/my-video-channel-update.component.ts index c9173039a..eb24a60c5 100644 --- a/client/src/app/+my-library/+my-video-channels/my-video-channel-update.component.ts +++ b/client/src/app/+my-library/+my-video-channels/my-video-channel-update.component.ts | |||
@@ -11,7 +11,7 @@ import { | |||
11 | } from '@app/shared/form-validators/video-channel-validators' | 11 | } from '@app/shared/form-validators/video-channel-validators' |
12 | import { FormValidatorService } from '@app/shared/shared-forms' | 12 | import { FormValidatorService } from '@app/shared/shared-forms' |
13 | import { VideoChannel, VideoChannelService } from '@app/shared/shared-main' | 13 | import { VideoChannel, VideoChannelService } from '@app/shared/shared-main' |
14 | import { ServerConfig, VideoChannelUpdate } from '@shared/models' | 14 | import { HTMLServerConfig, VideoChannelUpdate } from '@shared/models' |
15 | import { MyVideoChannelEdit } from './my-video-channel-edit' | 15 | import { MyVideoChannelEdit } from './my-video-channel-edit' |
16 | 16 | ||
17 | @Component({ | 17 | @Component({ |
@@ -25,7 +25,7 @@ export class MyVideoChannelUpdateComponent extends MyVideoChannelEdit implements | |||
25 | 25 | ||
26 | private paramsSub: Subscription | 26 | private paramsSub: Subscription |
27 | private oldSupportField: string | 27 | private oldSupportField: string |
28 | private serverConfig: ServerConfig | 28 | private serverConfig: HTMLServerConfig |
29 | 29 | ||
30 | constructor ( | 30 | constructor ( |
31 | protected formValidatorService: FormValidatorService, | 31 | protected formValidatorService: FormValidatorService, |
@@ -40,9 +40,7 @@ export class MyVideoChannelUpdateComponent extends MyVideoChannelEdit implements | |||
40 | } | 40 | } |
41 | 41 | ||
42 | ngOnInit () { | 42 | ngOnInit () { |
43 | this.serverConfig = this.serverService.getTmpConfig() | 43 | this.serverConfig = this.serverService.getHTMLConfig() |
44 | this.serverService.getConfig() | ||
45 | .subscribe(config => this.serverConfig = config) | ||
46 | 44 | ||
47 | this.buildForm({ | 45 | this.buildForm({ |
48 | 'display-name': VIDEO_CHANNEL_DISPLAY_NAME_VALIDATOR, | 46 | 'display-name': VIDEO_CHANNEL_DISPLAY_NAME_VALIDATOR, |
diff --git a/client/src/app/+my-library/my-library.component.ts b/client/src/app/+my-library/my-library.component.ts index 0cc91e484..939aa84c8 100644 --- a/client/src/app/+my-library/my-library.component.ts +++ b/client/src/app/+my-library/my-library.component.ts | |||
@@ -1,6 +1,6 @@ | |||
1 | import { Component, OnInit } from '@angular/core' | 1 | import { Component, OnInit } from '@angular/core' |
2 | import { AuthService, AuthUser, ScreenService, ServerService } from '@app/core' | 2 | import { AuthService, AuthUser, ScreenService, ServerService } from '@app/core' |
3 | import { ServerConfig } from '@shared/models' | 3 | import { HTMLServerConfig } from '@shared/models' |
4 | import { TopMenuDropdownParam } from '../shared/shared-main/misc/top-menu-dropdown.component' | 4 | import { TopMenuDropdownParam } from '../shared/shared-main/misc/top-menu-dropdown.component' |
5 | 5 | ||
6 | @Component({ | 6 | @Component({ |
@@ -11,7 +11,8 @@ export class MyLibraryComponent implements OnInit { | |||
11 | menuEntries: TopMenuDropdownParam[] = [] | 11 | menuEntries: TopMenuDropdownParam[] = [] |
12 | user: AuthUser | 12 | user: AuthUser |
13 | 13 | ||
14 | private serverConfig: ServerConfig | 14 | |
15 | private serverConfig: HTMLServerConfig | ||
15 | 16 | ||
16 | constructor ( | 17 | constructor ( |
17 | private serverService: ServerService, | 18 | private serverService: ServerService, |
@@ -24,9 +25,7 @@ export class MyLibraryComponent implements OnInit { | |||
24 | } | 25 | } |
25 | 26 | ||
26 | ngOnInit (): void { | 27 | ngOnInit (): void { |
27 | this.serverConfig = this.serverService.getTmpConfig() | 28 | this.serverConfig = this.serverService.getHTMLConfig() |
28 | this.serverService.getConfig() | ||
29 | .subscribe(config => this.serverConfig = config) | ||
30 | 29 | ||
31 | this.user = this.authService.getUser() | 30 | this.user = this.authService.getUser() |
32 | 31 | ||