From 7423148b862b0bc780502a6290608962c31c4105 Mon Sep 17 00:00:00 2001 From: dheeyi william Date: Thu, 26 Jan 2017 11:58:46 -0400 Subject: [PATCH 1/2] HOR-2527 CLONE - Array variable is not working in Mobile --- workflow/engine/classes/class.pmDynaform.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/workflow/engine/classes/class.pmDynaform.php b/workflow/engine/classes/class.pmDynaform.php index 125166c24..2ab1441e5 100644 --- a/workflow/engine/classes/class.pmDynaform.php +++ b/workflow/engine/classes/class.pmDynaform.php @@ -27,6 +27,7 @@ class pmDynaform private $context = array(); private $dataSources = null; private $databaseProviders = null; + private $propertyExclude = array(); public function __construct($fields = array()) { @@ -37,6 +38,7 @@ class pmDynaform $this->serverConf = &serverConf::getSingleton(); $this->isRTL = ($this->serverConf->isRtl(SYS_LANG)) ? 'true' : 'false'; $this->fields = $fields; + $this->propertyExclude = array('dataVariable'); $this->getDynaform(); $this->getDynaforms(); $this->synchronizeSubDynaform(); @@ -196,11 +198,13 @@ class pmDynaform if (is_string($value) && in_array(substr($value, 0, 2), $prefixs)) { $triggerValue = substr($value, 2); if (isset($this->fields["APP_DATA"][$triggerValue])) { - if ($key !== "dataVariable") { + if (!in_array($key, $this->propertyExclude)) { $json->{$key} = $this->fields["APP_DATA"][$triggerValue]; } } else { - $json->{$key} = ""; + if (!in_array($key, $this->propertyExclude)) { + $json->{$key} = ""; + } } } //set properties from 'formInstance' variable From a3a1a0c2e93a203c147ab9b47c2cc545460a90c1 Mon Sep 17 00:00:00 2001 From: dheeyi william Date: Thu, 26 Jan 2017 14:29:33 -0400 Subject: [PATCH 2/2] HOR-2527 CLONE - Array variable is not working in Mobile --- workflow/engine/classes/class.pmDynaform.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/workflow/engine/classes/class.pmDynaform.php b/workflow/engine/classes/class.pmDynaform.php index 2ab1441e5..1fb8638ab 100644 --- a/workflow/engine/classes/class.pmDynaform.php +++ b/workflow/engine/classes/class.pmDynaform.php @@ -27,7 +27,7 @@ class pmDynaform private $context = array(); private $dataSources = null; private $databaseProviders = null; - private $propertyExclude = array(); + private $propertiesToExclude = array(); public function __construct($fields = array()) { @@ -38,7 +38,7 @@ class pmDynaform $this->serverConf = &serverConf::getSingleton(); $this->isRTL = ($this->serverConf->isRtl(SYS_LANG)) ? 'true' : 'false'; $this->fields = $fields; - $this->propertyExclude = array('dataVariable'); + $this->propertiesToExclude = array('dataVariable'); $this->getDynaform(); $this->getDynaforms(); $this->synchronizeSubDynaform(); @@ -198,11 +198,11 @@ class pmDynaform if (is_string($value) && in_array(substr($value, 0, 2), $prefixs)) { $triggerValue = substr($value, 2); if (isset($this->fields["APP_DATA"][$triggerValue])) { - if (!in_array($key, $this->propertyExclude)) { + if (!in_array($key, $this->propertiesToExclude)) { $json->{$key} = $this->fields["APP_DATA"][$triggerValue]; } } else { - if (!in_array($key, $this->propertyExclude)) { + if (!in_array($key, $this->propertiesToExclude)) { $json->{$key} = ""; } }