Merged in bugfix/HOR-2527 (pull request #5370)
HOR-2527 Approved-by: Julio Cesar Laura Avendaño Approved-by: Paula Quispe
This commit is contained in:
@@ -27,6 +27,7 @@ class pmDynaform
|
||||
private $context = array();
|
||||
private $dataSources = null;
|
||||
private $databaseProviders = null;
|
||||
private $propertiesToExclude = 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->propertiesToExclude = array('dataVariable');
|
||||
$this->getDynaform();
|
||||
$this->getDynaforms();
|
||||
$this->synchronizeSubDynaform();
|
||||
@@ -196,13 +198,15 @@ 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->propertiesToExclude)) {
|
||||
$json->{$key} = $this->fields["APP_DATA"][$triggerValue];
|
||||
}
|
||||
} else {
|
||||
if (!in_array($key, $this->propertiesToExclude)) {
|
||||
$json->{$key} = "";
|
||||
}
|
||||
}
|
||||
}
|
||||
//set properties from 'formInstance' variable
|
||||
if (isset($this->fields["APP_DATA"]["formInstance"])) {
|
||||
$formInstance = $this->fields["APP_DATA"]["formInstance"];
|
||||
|
||||
Reference in New Issue
Block a user