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=f2eaa30339f08bb903792cf2825f6e47e7033232;hb=3318147300b4f998adf728eb0a5a14a4c1829c51;hp=538fa6f145d6405e1c2e955c17666b4e694ede13;hpb=1378c0d343028f3d40d7d795422684ab9e6a1599;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 538fa6f14..f2eaa3033 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 @@ -22,7 +22,8 @@ import { SERVICES_TWITTER_USERNAME_VALIDATOR, SIGNUP_LIMIT_VALIDATOR, SIGNUP_MINIMUM_AGE_VALIDATOR, - TRANSCODING_THREADS_VALIDATOR + TRANSCODING_THREADS_VALIDATOR, + MAX_VIDEO_CHANNELS_PER_USER_VALIDATOR } from '@app/shared/form-validators/custom-config-validators' import { USER_VIDEO_QUOTA_DAILY_VALIDATOR, USER_VIDEO_QUOTA_VALIDATOR } from '@app/shared/form-validators/user-validators' import { FormReactive, FormValidatorService } from '@app/shared/shared-forms' @@ -105,6 +106,18 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { whitelisted: null } }, + client: { + videos: { + miniature: { + preferAuthorDisplayName: null + } + }, + menu: { + login: { + redirectOnSingleExternalAuth: null + } + } + }, cache: { previews: { size: CACHE_PREVIEWS_SIZE_VALIDATOR @@ -151,6 +164,9 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { videoQuota: USER_VIDEO_QUOTA_VALIDATOR, videoQuotaDaily: USER_VIDEO_QUOTA_DAILY_VALIDATOR }, + videoChannels: { + maxPerUser: MAX_VIDEO_CHANNELS_PER_USER_VALIDATOR + }, transcoding: { enabled: null, threads: TRANSCODING_THREADS_VALIDATOR, @@ -258,9 +274,13 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { this.loadConfigAndUpdateForm() this.loadCategoriesAndLanguages() + + if (!this.isUpdateAllowed()) { + this.form.disable() + } } - async formValidated () { + formValidated () { const value: ComponentCustomConfig = this.form.getRawValue() forkJoin([ @@ -277,7 +297,9 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { // Reload general configuration this.serverService.resetConfig() - .subscribe(config => this.serverConfig = config) + .subscribe(config => { + this.serverConfig = config + }) this.updateForm() @@ -288,6 +310,10 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { }) } + isUpdateAllowed () { + return this.serverConfig.webadmin.configuration.edition.allowed === true + } + hasConsistentOptions () { if (this.hasLiveAllowReplayConsistentOptions()) return true