fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in bugfix/HOR-2527 (pull request #5370)

Browse Source 
HOR-2527

Approved-by: Julio Cesar Laura Avendaño
Approved-by: Paula Quispe
This commit is contained in:
Julio Cesar Laura Avendaño
2017-02-06 18:12:59 +00:00
parent 1803ff52f3 a3a1a0c2e9
commit bd0531467a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/classes/class.pmDynaform.php
View File

@@ -27,6 +27,7 @@ class pmDynaform
private $context = array(); private $context = array();
private $dataSources = null; private $dataSources = null;
private $databaseProviders = null; private $databaseProviders = null;
private $propertiesToExclude = array();
public function __construct($fields = array()) public function __construct($fields = array())
{ {
@@ -37,6 +38,7 @@ class pmDynaform
$this->serverConf = &serverConf::getSingleton(); $this->serverConf = &serverConf::getSingleton();
$this->isRTL = ($this->serverConf->isRtl(SYS_LANG)) ? 'true' : 'false'; $this->isRTL = ($this->serverConf->isRtl(SYS_LANG)) ? 'true' : 'false';
$this->fields = $fields; $this->fields = $fields;
$this->propertiesToExclude = array('dataVariable');
$this->getDynaform(); $this->getDynaform();
$this->getDynaforms(); $this->getDynaforms();
$this->synchronizeSubDynaform(); $this->synchronizeSubDynaform();
@@ -196,13 +198,15 @@ class pmDynaform
if (is_string($value) && in_array(substr($value, 0, 2), $prefixs)) { if (is_string($value) && in_array(substr($value, 0, 2), $prefixs)) {
$triggerValue = substr($value, 2); $triggerValue = substr($value, 2);
if (isset($this->fields["APP_DATA"][$triggerValue])) { if (isset($this->fields["APP_DATA"][$triggerValue])) {
if ($key !== "dataVariable") { if (!in_array($key, $this->propertiesToExclude)) {
$json->{$key} = $this->fields["APP_DATA"][$triggerValue]; $json->{$key} = $this->fields["APP_DATA"][$triggerValue];
} }
} else { } else {
if (!in_array($key, $this->propertiesToExclude)) {
$json->{$key} = ""; $json->{$key} = "";
} }
} }
}
//set properties from 'formInstance' variable //set properties from 'formInstance' variable
if (isset($this->fields["APP_DATA"]["formInstance"])) { if (isset($this->fields["APP_DATA"]["formInstance"])) {
$formInstance = $this->fields["APP_DATA"]["formInstance"]; $formInstance = $this->fields["APP_DATA"]["formInstance"];