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

Se adiciona el end point /project/{prj_uid}/dynaform/{dyn_uid}/fields

Browse Source
This commit is contained in:
Daniel Rojas
2014-07-18 17:26:10 -04:00
parent f137ccb766
commit 1ca96d4ea9
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php
View File

@@ -1026,10 +1026,9 @@ class DynaForm
$rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC); $rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
$rsCriteria->next(); $rsCriteria->next();
while ($aRow = $rsCriteria->getRow()) { $aRow = $rsCriteria->getRow();
$contentDecode = json_decode($aRow['DYN_CONTENT'],true); $contentDecode = json_decode($aRow['DYN_CONTENT'],true);
$rsCriteria->next();
}
$content = $contentDecode['items'][0]['items']; $content = $contentDecode['items'][0]['items'];
foreach ($content as $key => $value) { foreach ($content as $key => $value) {
@@ -1116,8 +1115,7 @@ class DynaForm
$optionsMerged = $options; $optionsMerged = $options;
} }
$arrayVariables[] = array( 'variable' => $variable,
$arrayVariables[] = array( 'variable' => $aRow['VAR_NAME'],
'valueType' => $valueTypeMerged, 'valueType' => $valueTypeMerged,
'maxLength' => $maxLengthMerged, 'maxLength' => $maxLengthMerged,
'label' => $labelMerged, 'label' => $labelMerged,
@@ -1136,19 +1134,18 @@ class DynaForm
'placeHolder' => $placeHolder, 'placeHolder' => $placeHolder,
'pickType' => $pickType); 'pickType' => $pickType);
$rsCriteria->next(); $rsCriteria->next();
} }
} else { } else {
$arrayVariables[] = array( 'variable' => $aRow['VAR_NAME'], $arrayVariables[] = array( 'valueType' => $valueType,
'valueType' => $valueTypeMerged, 'maxLength' => $maxLength,
'maxLength' => $maxLengthMerged, 'label' => $label,
'label' => $labelMerged, 'defaultValue' => $defaultValue,
'defaultValue' => $defaultValueMerged, 'required' => $required,
'required' => $requiredMerged, 'dbConnection' => $dbConnection,
'dbConnection' => $dbConnectionMerged, 'sql' => $sql,
'sql' => $sqlMerged, 'options' => $options,
'options' => $optionsMerged,
//values from fields properties
'type' => $type, 'type' => $type,
'colSpan' => $colSpan, 'colSpan' => $colSpan,
'name' => $name, 'name' => $name,