From 9d30db9017dc0e52291462339def2efed7a6697d Mon Sep 17 00:00:00 2001 From: Vito Albano Date: Mon, 14 Nov 2016 17:27:07 +0000 Subject: [PATCH] added changes to reflect the default option for dropdown --- .../src/components/widgets/core/form-field.model.spec.ts | 6 +++--- .../src/components/widgets/core/form-field.model.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.spec.ts index 90d2a9eece..4fdf3cdfad 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.spec.ts @@ -163,12 +163,12 @@ describe('FormFieldModel', () => { id: 'dropdown-2', type: FormFieldTypes.DROPDOWN, options: [ - { id: 'opt1', value: 'Option 1' }, - { id: 'opt2', value: 'Option 2' } + { id: 'opt1', name: 'Option 1' }, + { id: 'opt2', name: 'Option 2' } ] }); - field.value = 'opt2'; + field.value = 'Option 2'; expect(form.values['dropdown-2']).toEqual(field.options[1]); }); diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.ts index 11bd17fe82..4acd1bc54d 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.ts @@ -234,7 +234,7 @@ export class FormFieldModel extends FormWidgetModel { if (this.value === 'empty' || this.value === '') { this.form.values[this.id] = {}; } else { - let entry: FormFieldOption[] = this.options.filter(opt => opt.id === this.value); + let entry: FormFieldOption[] = this.options.filter(opt => opt.name === this.value); if (entry.length > 0) { this.form.values[this.id] = entry[0]; }