Browse Source

Closes #232

pull/235/head
Sebastian Stehle 8 years ago
parent
commit
5d72b24495
  1. 2
      src/Squidex/app/framework/angular/indeterminate-value.directive.ts
  2. 8
      src/Squidex/app/shared/services/schemas.fields.spec.ts
  3. 2
      src/Squidex/app/shared/services/schemas.service.ts

2
src/Squidex/app/framework/angular/indeterminate-value.directive.ts

@ -41,7 +41,9 @@ export class IndeterminateValueDirective implements ControlValueAccessor {
public writeValue(value: boolean | number | undefined) { public writeValue(value: boolean | number | undefined) {
if (!Types.isBoolean(value)) { if (!Types.isBoolean(value)) {
this.renderer.setElementProperty(this.element.nativeElement, 'indeterminate', true); this.renderer.setElementProperty(this.element.nativeElement, 'indeterminate', true);
this.renderer.setElementProperty(this.element.nativeElement, 'checked', false);
} else { } else {
this.renderer.setElementProperty(this.element.nativeElement, 'indeterminate', false);
this.renderer.setElementProperty(this.element.nativeElement, 'checked', value); this.renderer.setElementProperty(this.element.nativeElement, 'checked', value);
} }
} }

8
src/Squidex/app/shared/services/schemas.fields.spec.ts

@ -127,12 +127,12 @@ describe('BooleanField', () => {
expect(field.formatValue(null)).toBe(''); expect(field.formatValue(null)).toBe('');
}); });
it('should format to checkmark if true', () => { it('should format to Yes if true', () => {
expect(field.formatValue(true)).toBe(''); expect(field.formatValue(true)).toBe('Yes');
}); });
it('should format to minus if false', () => { it('should format to No if false', () => {
expect(field.formatValue(false)).toBe('-'); expect(field.formatValue(false)).toBe('No');
}); });
it('should return default value for default properties', () => { it('should return default value for default properties', () => {

2
src/Squidex/app/shared/services/schemas.service.ts

@ -525,7 +525,7 @@ export class BooleanFieldPropertiesDto extends FieldPropertiesDto {
return ''; return '';
} }
return value ? '✔' : '-'; return value ? 'Yes' : 'No';
} }
public createValidators(isOptional: boolean): ValidatorFn[] { public createValidators(isOptional: boolean): ValidatorFn[] {

Loading…
Cancel
Save