fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in gproly/processmaker (pull request #1398)

Browse Source 
IMPROVEMENT add options columns in grid to pmDynaform
This commit is contained in:
Julio Cesar Laura Avendaño
2015-02-06 11:52:25 -04:00
parent 876b1a0850 3953b87350
commit 4668707f8a
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,7 +119,7 @@ class pmDynaform
if (is_array($items[$key])) { if (is_array($items[$key])) {
$this->mergeAppData($app_uid, $items[$key]); $this->mergeAppData($app_uid, $items[$key]);
} else { } else {
if (isset($this->data[$items[$key]->name])) { if (isset($items[$key]->var_name) && isset($this->data[$items[$key]->var_name])) {
if ($items[$key]->type === "grid") { if ($items[$key]->type === "grid") {
$rows = $this->data[$items[$key]->name]; $rows = $this->data[$items[$key]->name];
foreach ($rows as $keyRow => $row) { foreach ($rows as $keyRow => $row) {
@@ -153,11 +153,14 @@ class pmDynaform
} }
$items[$key]->options = $options; $items[$key]->options = $options;
} }
if (isset($items[$key]->columns)) {
$this->mergeAppData($app_uid, $items[$key]->columns);
}
} }
} }
} }
public function mergeDynContentAppData($app_uid, $items) public function mergeDynContentAppData($app_uid, &$items)
{ {
$dynContent = G::json_decode($this->record["DYN_CONTENT"]); $dynContent = G::json_decode($this->record["DYN_CONTENT"]);
if (isset($dynContent->items)) { if (isset($dynContent->items)) {