X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Badmin%2Fconfig%2Fedit-custom-config%2Fedit-custom-config.component.ts;h=c88e81c01453e0ce56961a276e715a5f5acf51b1;hb=9b3078581f2767c7aa2ed5766e1a588ebc0cb875;hp=ed9c3247ccf9a25a66b9d30f52ea1f49aa595cd7;hpb=46db9430af70f45bc656cb0ac8e519f5d0be0149;p=github%2FChocobozzz%2FPeerTube.git 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 ed9c3247c..c88e81c01 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 @@ -41,7 +41,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { { id: '0p', label: this.i18n('Audio-only'), - description: `A .mp4 that keeps the original audio track, with no video` + description: this.i18n('A .mp4 that keeps the original audio track, with no video') }, { id: '240p', @@ -222,25 +222,8 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { } this.buildForm(formGroupData) - - forkJoin([ - this.configService.getCustomConfig(), - this.serverService.getVideoLanguages(), - this.serverService.getVideoCategories() - ]).subscribe( - ([ config, languages, categories ]) => { - this.customConfig = config - - this.languageItems = languages.map(l => ({ label: l.label, value: l.id })) - this.categoryItems = categories.map(l => ({ label: l.label, value: l.id })) - - this.updateForm() - // Force form validation - this.forceCheck() - }, - - err => this.notifier.error(err.message) - ) + this.loadForm() + this.checkTranscodingFields() } isTranscodingEnabled () { @@ -251,10 +234,12 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { return this.form.value['signup']['enabled'] === true } + isAutoFollowIndexEnabled () { + return this.form.value['followings']['instance']['autoFollowIndex']['enabled'] === true + } + async formValidated () { - this.configService.updateCustomConfig(this.form.value) - .pipe( - ) + this.configService.updateCustomConfig(this.form.getRawValue()) .subscribe( res => { this.customConfig = res @@ -290,4 +275,52 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { private updateForm () { this.form.patchValue(this.customConfig) } + + private loadForm () { + forkJoin([ + this.configService.getCustomConfig(), + this.serverService.getVideoLanguages(), + this.serverService.getVideoCategories() + ]).subscribe( + ([ config, languages, categories ]) => { + this.customConfig = config + + this.languageItems = languages.map(l => ({ label: l.label, value: l.id })) + this.categoryItems = categories.map(l => ({ label: l.label, value: l.id })) + + this.updateForm() + // Force form validation + this.forceCheck() + }, + + err => this.notifier.error(err.message) + ) + } + + private checkTranscodingFields () { + const hlsControl = this.form.get('transcoding.hls.enabled') + const webtorrentControl = this.form.get('transcoding.webtorrent.enabled') + + webtorrentControl.valueChanges + .subscribe(newValue => { + if (newValue === false && !hlsControl.disabled) { + hlsControl.disable() + } + + if (newValue === true && !hlsControl.enabled) { + hlsControl.enable() + } + }) + + hlsControl.valueChanges + .subscribe(newValue => { + if (newValue === false && !webtorrentControl.disabled) { + webtorrentControl.disable() + } + + if (newValue === true && !webtorrentControl.enabled) { + webtorrentControl.enable() + } + }) + } }