diff options
author | Chocobozzz <me@florianbigard.com> | 2021-06-04 13:31:41 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-06-04 15:45:44 +0200 |
commit | 2989628b7913383b39ac34c7db8666a21f8e5037 (patch) | |
tree | ac7759177c04e524e7845143fd685aefb49e810e /client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts | |
parent | 8e08d415f9473b6b72fef698729453e726da16e7 (diff) | |
download | PeerTube-2989628b7913383b39ac34c7db8666a21f8e5037.tar.gz PeerTube-2989628b7913383b39ac34c7db8666a21f8e5037.tar.zst PeerTube-2989628b7913383b39ac34c7db8666a21f8e5037.zip |
Use HTML config when possible
Diffstat (limited to 'client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts')
-rw-r--r-- | client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts index cb65ca6e7..1e8cfb021 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts | |||
@@ -27,7 +27,7 @@ import { | |||
27 | import { USER_VIDEO_QUOTA_DAILY_VALIDATOR, USER_VIDEO_QUOTA_VALIDATOR } from '@app/shared/form-validators/user-validators' | 27 | import { USER_VIDEO_QUOTA_DAILY_VALIDATOR, USER_VIDEO_QUOTA_VALIDATOR } from '@app/shared/form-validators/user-validators' |
28 | import { FormReactive, FormValidatorService } from '@app/shared/shared-forms' | 28 | import { FormReactive, FormValidatorService } from '@app/shared/shared-forms' |
29 | import { CustomPageService } from '@app/shared/shared-main/custom-page' | 29 | import { CustomPageService } from '@app/shared/shared-main/custom-page' |
30 | import { CustomConfig, CustomPage, ServerConfig } from '@shared/models' | 30 | import { CustomConfig, CustomPage, HTMLServerConfig } from '@shared/models' |
31 | import { EditConfigurationService } from './edit-configuration.service' | 31 | import { EditConfigurationService } from './edit-configuration.service' |
32 | 32 | ||
33 | type ComponentCustomConfig = CustomConfig & { | 33 | type ComponentCustomConfig = CustomConfig & { |
@@ -43,7 +43,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { | |||
43 | activeNav: string | 43 | activeNav: string |
44 | 44 | ||
45 | customConfig: ComponentCustomConfig | 45 | customConfig: ComponentCustomConfig |
46 | serverConfig: ServerConfig | 46 | serverConfig: HTMLServerConfig |
47 | 47 | ||
48 | homepage: CustomPage | 48 | homepage: CustomPage |
49 | 49 | ||
@@ -64,9 +64,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { | |||
64 | } | 64 | } |
65 | 65 | ||
66 | ngOnInit () { | 66 | ngOnInit () { |
67 | this.serverConfig = this.serverService.getTmpConfig() | 67 | this.serverConfig = this.serverService.getHTMLConfig() |
68 | this.serverService.getConfig() | ||
69 | .subscribe(config => this.serverConfig = config) | ||
70 | 68 | ||
71 | const formGroupData: { [key in keyof ComponentCustomConfig ]: any } = { | 69 | const formGroupData: { [key in keyof ComponentCustomConfig ]: any } = { |
72 | instance: { | 70 | instance: { |