From 5d72b2449504bc7e8370df8d0cd167da20fd4a3f Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Tue, 23 Jan 2018 19:12:33 +0100 Subject: [PATCH] Closes #232 --- .../framework/angular/indeterminate-value.directive.ts | 2 ++ src/Squidex/app/shared/services/schemas.fields.spec.ts | 8 ++++---- src/Squidex/app/shared/services/schemas.service.ts | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Squidex/app/framework/angular/indeterminate-value.directive.ts b/src/Squidex/app/framework/angular/indeterminate-value.directive.ts index cb1fce7b5..551e7c66a 100644 --- a/src/Squidex/app/framework/angular/indeterminate-value.directive.ts +++ b/src/Squidex/app/framework/angular/indeterminate-value.directive.ts @@ -41,7 +41,9 @@ export class IndeterminateValueDirective implements ControlValueAccessor { public writeValue(value: boolean | number | undefined) { if (!Types.isBoolean(value)) { this.renderer.setElementProperty(this.element.nativeElement, 'indeterminate', true); + this.renderer.setElementProperty(this.element.nativeElement, 'checked', false); } else { + this.renderer.setElementProperty(this.element.nativeElement, 'indeterminate', false); this.renderer.setElementProperty(this.element.nativeElement, 'checked', value); } } diff --git a/src/Squidex/app/shared/services/schemas.fields.spec.ts b/src/Squidex/app/shared/services/schemas.fields.spec.ts index 13edcc782..791e25799 100644 --- a/src/Squidex/app/shared/services/schemas.fields.spec.ts +++ b/src/Squidex/app/shared/services/schemas.fields.spec.ts @@ -127,12 +127,12 @@ describe('BooleanField', () => { expect(field.formatValue(null)).toBe(''); }); - it('should format to checkmark if true', () => { - expect(field.formatValue(true)).toBe('✔'); + it('should format to Yes if true', () => { + expect(field.formatValue(true)).toBe('Yes'); }); - it('should format to minus if false', () => { - expect(field.formatValue(false)).toBe('-'); + it('should format to No if false', () => { + expect(field.formatValue(false)).toBe('No'); }); it('should return default value for default properties', () => { diff --git a/src/Squidex/app/shared/services/schemas.service.ts b/src/Squidex/app/shared/services/schemas.service.ts index df022d6d6..63fdd2f5a 100644 --- a/src/Squidex/app/shared/services/schemas.service.ts +++ b/src/Squidex/app/shared/services/schemas.service.ts @@ -525,7 +525,7 @@ export class BooleanFieldPropertiesDto extends FieldPropertiesDto { return ''; } - return value ? '✔' : '-'; + return value ? 'Yes' : 'No'; } public createValidators(isOptional: boolean): ValidatorFn[] {