ActivityPub-federated video streaming platform using P2P directly in your web browser
Fix choosing the licence in admin
Chocobozzz2790ec5aaa4b
diff --git a/client/src/app/+admin/config/pages/admin-config-general.component.html b/client/src/app/+admin/config/pages/admin-config-general.component.htmlindex 2638c3cdd7..4b7d9d5101 100644--- a/client/src/app/+admin/config/pages/admin-config-general.component.html+++ b/client/src/app/+admin/config/pages/admin-config-general.component.html@@ -414,7 +414,7 @@<div class="form-group"><label i18n for="defaultsPublishLicence">Default video licence</label>- <my-select-options inputId="defaultsPublishLicence" [items]="licenceOptions" formControlName="licence"></my-select-options>+ <my-select-options inputId="defaultsPublishLicence" [items]="licenceOptions" formControlName="licence" clearable="true"></my-select-options><div *ngIf="formErrors.defaults.publish.licence" class="form-error" role="alert">{{ formErrors.defaults.publish.licence }}</div></div>diff --git a/client/src/app/+admin/config/pages/admin-config-general.component.ts b/client/src/app/+admin/config/pages/admin-config-general.component.tsindex f1477fe706..ba2be5e07e 100644--- a/client/src/app/+admin/config/pages/admin-config-general.component.ts+++ b/client/src/app/+admin/config/pages/admin-config-general.component.ts@@ -258,6 +258,7 @@ export class AdminConfigGeneralComponent implements OnInit, OnDestroy, CanComponthis.privacyOptions = this.videoService.explainedPrivacyLabels(data.privacies).videoPrivaciesthis.licenceOptions = data.licences+this.commentPoliciesOptions = data.commentPoliciesthis.buildLandingPageOptions()@@ -592,7 +593,7 @@ export class AdminConfigGeneralComponent implements OnInit, OnDestroy, CanComponcurrentConfig: this.customConfig,form: this.form,formConfig: this.form.value,- success: $localize`Live configuration updated.`+ success: $localize`General configuration updated.`})}}diff --git a/client/src/app/shared/shared-forms/form-validator.service.ts b/client/src/app/shared/shared-forms/form-validator.service.tsindex 7450d03474..3a7488dc35 100644--- a/client/src/app/shared/shared-forms/form-validator.service.ts+++ b/client/src/app/shared/shared-forms/form-validator.service.ts@@ -28,7 +28,9 @@ export class FormValidatorService {if (field?.MESSAGES) validationMessages[name] = field.MESSAGES as { [name: string]: string }- const defaultValue = defaultValues[name] ?? ''+ const defaultValue = defaultValues[name] !== undefined+ ? defaultValues[name]+ : ''if (field?.VALIDATORS) group[name] = [ defaultValue, field.VALIDATORS ]else group[name] = [ defaultValue ]diff --git a/server/core/middlewares/validators/config.ts b/server/core/middlewares/validators/config.tsindex f689cfe0ad..a42c8a06cd 100644--- a/server/core/middlewares/validators/config.ts+++ b/server/core/middlewares/validators/config.ts@@ -140,7 +140,7 @@ export const customConfigUpdateValidator = [body('defaults.publish.commentsPolicy').custom(isVideoCommentsPolicyValid),body('defaults.publish.privacy').custom(isVideoPrivacyValid),- body('defaults.publish.licence').custom(isVideoLicenceValid),+ body('defaults.publish.licence').optional().custom(isVideoLicenceValid),body('defaults.p2p.webapp.enabled').isBoolean(),body('defaults.p2p.embed.enabled').isBoolean(),body('defaults.player.autoPlay').isBoolean(),