inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2026-09-09 18:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

#538 ignore label as value

Browse Source
This commit is contained in:
Mario Romano
2016-08-12 10:11:08 +01:00
parent b6626e1c20
commit dccaa74253
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ng2-components/ng2-activiti-form/src/components/widgets/widget.model.ts
+18 -7
View File
@@ -29,6 +29,7 @@ export class FormFieldTypes {
static HYPERLINK: string = 'hyperlink'; static HYPERLINK: string = 'hyperlink';
static RADIO_BUTTONS: string = 'radio-buttons'; static RADIO_BUTTONS: string = 'radio-buttons';
static DISPLAY_VALUE: string = 'readonly'; static DISPLAY_VALUE: string = 'readonly';
static READONLY_TEXT: string = 'readonly-text';
} }
export class FormWidgetModel { export class FormWidgetModel {
@@ -128,9 +129,9 @@ export class FormFieldModel extends FormWidgetModel {
*/ */
// TODO: needs review // TODO: needs review
if (json.type === FormFieldTypes.DROPDOWN) { if (json.type === FormFieldTypes.DROPDOWN) {
if (value === '') { if (value === '') {
value = 'empty'; value = 'empty';
} }
} }
/* /*
@@ -177,7 +178,17 @@ export class FormFieldModel extends FormWidgetModel {
this.form.values[this.id] = this.options[0].id; this.form.values[this.id] = this.options[0].id;
} }
} else { } else {
this.form.values[this.id] = this.value; if (!this.isIngonreType()) {
this.form.values[this.id] = this.value;
}
}
}
private isIngonreType(): boolean {
if (this.type === FormFieldTypes.READONLY_TEXT) {
return true;
} else {
return false;
} }
} }
} }
@@ -337,7 +348,7 @@ export class FormModel {
return this._taskId; return this._taskId;
} }
get taskName(): string{ get taskName(): string {
return this._taskName; return this._taskName;
} }
@@ -394,10 +405,10 @@ export class FormModel {
} }
} }
let saveOutcome = new FormOutcomeModel(this, { id: '$save', name: 'Save' }); let saveOutcome = new FormOutcomeModel(this, {id: '$save', name: 'Save'});
saveOutcome.isSystem = true; saveOutcome.isSystem = true;
let completeOutcome = new FormOutcomeModel(this, { id: '$complete', name: 'Complete' }); let completeOutcome = new FormOutcomeModel(this, {id: '$complete', name: 'Complete'});
completeOutcome.isSystem = true; completeOutcome.isSystem = true;
let customOutcomes = (json.outcomes || []).map(obj => new FormOutcomeModel(this, obj)); let customOutcomes = (json.outcomes || []).map(obj => new FormOutcomeModel(this, obj));