From b61a3f8e038ed676892fdfb32581b98d066a0ae9 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Wed, 2 Jan 2019 11:03:50 +0100
Subject: [PATCH] =?UTF-8?q?S=C3=A9curisation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../externs/formReader/formReaderDrtv.js | 28 ++++++++++---------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/vitis/client/javascript/externs/formReader/formReaderDrtv.js b/src/vitis/client/javascript/externs/formReader/formReaderDrtv.js
index b561f4e1..b1d3ba9b 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));
+ }
}
}
}
--
GitLab