diff --git a/src/vitis/client/javascript/externs/formReader/formReaderDrtv.js b/src/vitis/client/javascript/externs/formReader/formReaderDrtv.js index b561f4e1ba8aa7cd862741e26612a4ed8c715799..b1d3ba9bc5d670cda51c35656f8dac26274c36a1 100644 --- a/src/vitis/client/javascript/externs/formReader/formReaderDrtv.js +++ b/src/vitis/client/javascript/externs/formReader/formReaderDrtv.js @@ -524,25 +524,27 @@ formReader.formReaderDirective = function ($q, formReaderService, propertiesSrvc this.dynamicWatchers_ = []; } - if (goog.isDefAndNotNull(oFormDefinition[sFormDefinitionName])) { + if (goog.isDefAndNotNull(oFormDefinition)) { + if (goog.isDefAndNotNull(oFormDefinition[sFormDefinitionName])) { - var aFormElementDefinitions = formReaderService['getAllFormElementDefinition'](sFormDefinitionName, oFormDefinition) + var aFormElementDefinitions = formReaderService['getAllFormElementDefinition'](sFormDefinitionName, oFormDefinition) - for (var i = 0; i < aFormElementDefinitions.length; i++) { - if (goog.isDefAndNotNull(aFormElementDefinitions[i]['dynamic_value'])) { + for (var i = 0; i < aFormElementDefinitions.length; i++) { + if (goog.isDefAndNotNull(aFormElementDefinitions[i]['dynamic_value'])) { - // Ajoute les watchers sur les champs présents dans l'expression dynamic_value - if(formReaderService["isCustomTernaryString"](aFormElementDefinitions[i]["dynamic_value"], false)) { - aAttrs = formReaderService['getCustomTernaryStringAttrs'](aFormElementDefinitions[i]["dynamic_value"]); + // Ajoute les watchers sur les champs présents dans l'expression dynamic_value + if(formReaderService["isCustomTernaryString"](aFormElementDefinitions[i]["dynamic_value"], false)) { + aAttrs = formReaderService['getCustomTernaryStringAttrs'](aFormElementDefinitions[i]["dynamic_value"]); - for (var ii = 0; ii < aAttrs.length; ii++) { - if (goog.isDefAndNotNull(aAttrs[ii][1])) { + for (var ii = 0; ii < aAttrs.length; ii++) { + if (goog.isDefAndNotNull(aAttrs[ii][1])) { - this.dynamicWatchers_.push(scope.$watch('oFormValues[sFormDefinitionName].' + aAttrs[ii][1], angular.bind(this, function(oField, newVal, oldVal, scope){ + this.dynamicWatchers_.push(scope.$watch('oFormValues[sFormDefinitionName].' + aAttrs[ii][1], angular.bind(this, function(oField, newVal, oldVal, scope){ - // Set la nouvelle valeur - this['setDynamicValue'](oField); - }, angular.copy(aFormElementDefinitions[i])), true)); + // Set la nouvelle valeur + this['setDynamicValue'](oField); + }, angular.copy(aFormElementDefinitions[i])), true)); + } } } }