Merged in bugfix/PMC-975 (pull request #6977)
PMC-975 Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
28
workflow/engine/classes/PmDynaform.php
Normal file → Executable file
28
workflow/engine/classes/PmDynaform.php
Normal file → Executable file
@@ -2334,34 +2334,6 @@ class PmDynaform
|
|||||||
$this->lastQueryError = null;
|
$this->lastQueryError = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* This adds a new definition on the json dynaform
|
|
||||||
* @param json $json
|
|
||||||
*
|
|
||||||
* @link https://wiki.processmaker.com/3.0/Grid_Control
|
|
||||||
* @see workflow/engine/classes/PmDynaform->jsonr
|
|
||||||
*/
|
|
||||||
public function setDataSchema($json, $appDataVariables)
|
|
||||||
{
|
|
||||||
foreach ($json->data as $key => $value) {
|
|
||||||
$columnsData = [];
|
|
||||||
foreach ($json->columns as $keyData => $valueData) {
|
|
||||||
foreach ($appDataVariables as $keyAppData => $valueAppData) {
|
|
||||||
if (array_key_exists($valueData->id, $valueAppData) || array_key_exists($valueData->id . "_label",
|
|
||||||
$valueAppData) || array_key_exists($valueData->name,
|
|
||||||
$valueAppData) || array_key_exists($valueData->name . "_label", $valueAppData)) {
|
|
||||||
array_push($columnsData, ["defined" => true]);
|
|
||||||
break;
|
|
||||||
} else {
|
|
||||||
array_push($columnsData, ["defined" => false]);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$json->dataSchema[$key] = $columnsData;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get session message.
|
* Get session message.
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user