From 7d2d423e87fda15f81a5653e8cca20eb3b415f1d Mon Sep 17 00:00:00 2001 From: Keith Wyss Date: Thu, 16 Nov 2017 16:34:43 -0600 Subject: [PATCH] Allow Dropdown and Radio fields to be empty if they are not required --- .../content/pages/content/content-page.component.ts | 2 +- src/Squidex/app/shared/services/schemas.service.ts | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Squidex/app/features/content/pages/content/content-page.component.ts b/src/Squidex/app/features/content/pages/content/content-page.component.ts index bd7f81dc7..d5fb781a9 100644 --- a/src/Squidex/app/features/content/pages/content/content-page.component.ts +++ b/src/Squidex/app/features/content/pages/content/content-page.component.ts @@ -253,7 +253,7 @@ export class ContentPageComponent implements CanComponentDeactivate, OnDestroy, fieldForm.controls[language.iso2Code].setValue(fieldValue[language.iso2Code]); } } else { - fieldForm.controls['iv'].setValue(fieldValue['iv']); + fieldForm.controls['iv'].setValue(fieldValue['iv'] === undefined ? null : fieldValue['iv']); } } diff --git a/src/Squidex/app/shared/services/schemas.service.ts b/src/Squidex/app/shared/services/schemas.service.ts index c240c4971..730dccd5f 100644 --- a/src/Squidex/app/shared/services/schemas.service.ts +++ b/src/Squidex/app/shared/services/schemas.service.ts @@ -378,7 +378,11 @@ export class StringFieldPropertiesDto extends FieldPropertiesDto { } if (this.allowedValues && this.allowedValues.length > 0) { - validators.push(ValidatorsEx.validValues(this.allowedValues)); + if (this.isRequired && !isOptional) { + validators.push(ValidatorsEx.validValues(this.allowedValues)); + } else { + validators.push(ValidatorsEx.validValues(this.allowedValues.concat([null]))); + } } return validators;