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

HOR-2818

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2017-03-09 11:12:09 -04:00
parent 96d749f9fb
commit 8d2e827d26
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -634,6 +634,7 @@ class pmDynaform
} }
//grid //grid
if ($key === "type" && ($value === "grid")) { if ($key === "type" && ($value === "grid")) {
$columnsDataVariable = [];
//todo compatibility 'columnWidth' //todo compatibility 'columnWidth'
foreach ($json->columns as $column) { foreach ($json->columns as $column) {
if (!isset($column->columnWidth) && $column->type !== "hidden") { if (!isset($column->columnWidth) && $column->type !== "hidden") {
@@ -641,12 +642,27 @@ class pmDynaform
$column->columnWidth = ""; $column->columnWidth = "";
} }
$column->parentIsGrid = true; $column->parentIsGrid = true;
//save dataVariable value, only for columns control
if (!empty($column->dataVariable) && is_string($column->dataVariable)) {
if (in_array(substr($column->dataVariable, 0, 2), self::$prefixs)) {
$dataVariableValue = substr($column->dataVariable, 2);
if (!in_array($dataVariableValue, $columnsDataVariable)) {
$columnsDataVariable[] = $dataVariableValue;
}
}
}
} }
//data grid environment //data grid environment
$json->dataGridEnvironment = "onDataGridEnvironment"; $json->dataGridEnvironment = "onDataGridEnvironment";
if (isset($this->fields["APP_DATA"])) { if (isset($this->fields["APP_DATA"])) {
$dataGridEnvironment = $this->fields["APP_DATA"]; $dataGridEnvironment = $this->fields["APP_DATA"];
$this->fields["APP_DATA"] = []; $this->fields["APP_DATA"] = [];
//restore AppData with dataVariable definition, only for columns control
foreach ($columnsDataVariable as $dge) {
if (isset($dataGridEnvironment[$dge])) {
$this->fields["APP_DATA"][$dge] = $dataGridEnvironment[$dge];
}
}
} }
} }
if ($key === "dataGridEnvironment" && ($value === "onDataGridEnvironment")) { if ($key === "dataGridEnvironment" && ($value === "onDataGridEnvironment")) {