Fixed bug in xosForm
diff --git a/views/ngXosLib/xosHelpers/src/services/helpers/ui/form.helpers.js b/views/ngXosLib/xosHelpers/src/services/helpers/ui/form.helpers.js
index 2dabfe1..88cff60 100644
--- a/views/ngXosLib/xosHelpers/src/services/helpers/ui/form.helpers.js
+++ b/views/ngXosLib/xosHelpers/src/services/helpers/ui/form.helpers.js
@@ -91,7 +91,8 @@
this.buildFormStructure = (modelField, customField, model) => {
- modelField = Object.keys(modelField).length > 0 ? modelField : customField; //if no model field are provided, check custom
+ // modelField = Object.keys(modelField).length > 0 ? modelField : customField; //if no model field are provided, check custom
+ modelField = angular.extend(modelField, customField);
customField = customField || {};
return _.reduce(Object.keys(modelField), (form, f) => {
diff --git a/views/ngXosLib/xosHelpers/src/ui_components/dumbComponents/form/form.component.js b/views/ngXosLib/xosHelpers/src/ui_components/dumbComponents/form/form.component.js
index 2a9f00c..9d68d56 100644
--- a/views/ngXosLib/xosHelpers/src/ui_components/dumbComponents/form/form.component.js
+++ b/views/ngXosLib/xosHelpers/src/ui_components/dumbComponents/form/form.component.js
@@ -208,7 +208,9 @@
let diff = _.difference(Object.keys(model), this.excludedField);
let modelField = XosFormHelpers.parseModelField(diff);
+ console.log(modelField, this.config.fields, model);
this.formField = XosFormHelpers.buildFormStructure(modelField, this.config.fields, model);
+ console.log(this.formField);
});
}
diff --git a/views/ngXosLib/xosHelpers/src/ui_components/dumbComponents/validation/validation.component.js b/views/ngXosLib/xosHelpers/src/ui_components/dumbComponents/validation/validation.component.js
index 37cfbd5..91610e1 100644
--- a/views/ngXosLib/xosHelpers/src/ui_components/dumbComponents/validation/validation.component.js
+++ b/views/ngXosLib/xosHelpers/src/ui_components/dumbComponents/validation/validation.component.js
@@ -82,9 +82,6 @@
},
template: `
<div ng-cloak>
- <pre>{{vm.field | json}}</pre>
- <!--<pre>{{vm.form.$submitted | json}}</pre>-->
- <!--<pre>{{vm.field.$error.required !== false}}</pre>-->
<xos-alert config="vm.config" show="vm.field.$error.required !== undefined && vm.field.$error.required !== false && (vm.field.$touched || vm.form.$submitted)">
Field required
</xos-alert>