From ce67731e244a663c63e1565a978d732075ea4441 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Thu, 3 Jan 2019 10:39:39 +0100
Subject: [PATCH] Syntax
---
.../client/javascript/externs/formReader/formReaderDrtv.js | 1 +
.../studio/javascript/app/VisualizerMode/FormMode.js | 2 +-
.../javascript/externs/studio/templates/ElementForm.html | 6 +++---
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/vitis/client/javascript/externs/formReader/formReaderDrtv.js b/src/vitis/client/javascript/externs/formReader/formReaderDrtv.js
index b1d3ba9b..609e6316 100644
--- a/src/vitis/client/javascript/externs/formReader/formReaderDrtv.js
+++ b/src/vitis/client/javascript/externs/formReader/formReaderDrtv.js
@@ -504,6 +504,7 @@ formReader.formReaderDirective = function ($q, formReaderService, propertiesSrvc
}
}
}
+
/**
* Ajoute des watchers pour déclencher les dynamic values
*
diff --git a/src/vitis/client/javascript/externs/studio/javascript/app/VisualizerMode/FormMode.js b/src/vitis/client/javascript/externs/studio/javascript/app/VisualizerMode/FormMode.js
index 86872e18..70d74a4b 100755
--- a/src/vitis/client/javascript/externs/studio/javascript/app/VisualizerMode/FormMode.js
+++ b/src/vitis/client/javascript/externs/studio/javascript/app/VisualizerMode/FormMode.js
@@ -147,7 +147,7 @@ nsVFB.nsVisualizerMode.FormMode.prototype.visualizerFormModeController = functio
// Refresh le formReader
angular.element($('#studio_form_reader').children()).scope()['ctrl'].refreshForm();
- angular.element($('#studio_form_reader').children()).scope().$broadcast('loadForm');
+ angular.element($('#studio_form_reader').children()).scope()['setFormDynamicValues']();
} else {
oVFB.log('visualizerFormModeController. Load JSON form fail: ' + $scope['selected_form_type'] + ' undefined in ', data);
diff --git a/src/vitis/client/javascript/externs/studio/templates/ElementForm.html b/src/vitis/client/javascript/externs/studio/templates/ElementForm.html
index 05698ebc..6d8afd0c 100755
--- a/src/vitis/client/javascript/externs/studio/templates/ElementForm.html
+++ b/src/vitis/client/javascript/externs/studio/templates/ElementForm.html
@@ -2193,7 +2193,7 @@
<span id="Element_Form_dynamic_value_label" class="input-group-addon">{{::ctrl.text.Component.General.Value}}</span>
<input ng-disabled="locker"
ng-model="model.dynamic_value"
- id="Element_Form_value_input"
+ id="Element_Form_dynamic_value_input"
type="text"
class="form-control"
aria-describedby="Element_Form_dynamic_value_label"
@@ -2203,10 +2203,10 @@
<!-- Champ visible -->
<div ng-if="model.type != 'hidden'"
class="input-group element-margin input-group-xs">
- <span id="Element_Form_visible_label" class="input-group-addon">{{::ctrl.text.Component.General.Visible}}</span>
+ <span id="Element_Form_dynamic_visible_label" class="input-group-addon">{{::ctrl.text.Component.General.Visible}}</span>
<input ng-disabled="locker"
ng-model="model.visible"
- id="Element_Form_visible_input"
+ id="Element_Form_dynamic_visible_input"
type="text"
class="form-control"
aria-describedby="Element_Form_visible_label"
--
GitLab