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

#572 Minor code improvements

Browse Source
This commit is contained in:
Denys Vuika
2016-08-15 11:57:47 +01:00
parent 4a0c6e6e29
commit 2192fe648a
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ng2-components/ng2-activiti-form/src/components/widgets/widget.model.ts
+11 -10
View File
@@ -30,6 +30,10 @@ export class FormFieldTypes {
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'; static READONLY_TEXT: string = 'readonly-text';
static READONLY_TYPES: string[] = [
FormFieldTypes.READONLY_TEXT
];
} }
export class FormWidgetModel { export class FormWidgetModel {
@@ -178,18 +182,14 @@ 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 {
if (!this.isIngonreType()) { if (!FormFieldModel.isReadOnlyType(this.type)) {
this.form.values[this.id] = this.value; this.form.values[this.id] = this.value;
} }
} }
} }
private isIngonreType(): boolean { static isReadOnlyType(type: string) {
if (this.type === FormFieldTypes.READONLY_TEXT) { return FormFieldTypes.READONLY_TYPES.indexOf(type) > -1;
return true;
} else {
return false;
}
} }
} }
@@ -387,7 +387,6 @@ export class FormModel {
let tabCache: WidgetModelCache<TabModel> = {}; let tabCache: WidgetModelCache<TabModel> = {};
// this.tabs = (json.tabs || []).map(t => new TabModel(this, t));
this.tabs = (json.tabs || []).map(t => { this.tabs = (json.tabs || []).map(t => {
let model = new TabModel(this, t); let model = new TabModel(this, t);
tabCache[model.id] = model; tabCache[model.id] = model;
@@ -397,7 +396,7 @@ export class FormModel {
this.fields = (json.fields || json.formDefinition.fields || []).map(obj => new ContainerModel(this, obj)); this.fields = (json.fields || json.formDefinition.fields || []).map(obj => new ContainerModel(this, obj));
if (data) { if (data) {
this.updateFormValueWithProvaidedDataModel(data); this.loadData(data);
} }
for (let i = 0; i < this.fields.length; i++) { for (let i = 0; i < this.fields.length; i++) {
@@ -432,7 +431,9 @@ export class FormModel {
} }
} }
private updateFormValueWithProvaidedDataModel(data: any) { // Loads external data and overrides field values
// Typically used when form definition and form data coming from different sources
private loadData(data: any) {
for (let i = 0; i < this.fields.length; i++) { for (let i = 0; i < this.fields.length; i++) {
let containerModel = this.fields[i]; let containerModel = this.fields[i];
if (containerModel) { if (containerModel) {