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

Merged in gproly/processmaker (pull request #1375)

Browse Source 
PM-1344
This commit is contained in:
Julio Cesar Laura Avendaño
2015-02-04 13:05:28 -04:00
parent e79c7e8799 8e28c0a16f
commit addaae4031
1 changed files with 44 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
workflow/engine/classes/class.xmlfield_InputPM.php
View File

@@ -392,6 +392,31 @@ function getDynaformsVars ($sProcessUID, $bSystemVars = true, $bIncMulSelFields
if ($bIncMulSelFields != 0) { if ($bIncMulSelFields != 0) {
$aInvalidTypes = array_merge( $aInvalidTypes, $aMultipleSelectionFields ); $aInvalidTypes = array_merge( $aInvalidTypes, $aMultipleSelectionFields );
} }
// getting bpmn projects
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(BpmnProjectPeer::PRJ_UID);
$oCriteria->add(BpmnProjectPeer::PRJ_UID, $sProcessUID);
$oDataset = ProcessPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
$row = $oDataset->getRow();
if (isset($row["PRJ_UID"])) {
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(ProcessVariablesPeer::VAR_UID);
$oCriteria->addSelectColumn(ProcessVariablesPeer::VAR_NAME);
$oCriteria->addSelectColumn(ProcessVariablesPeer::VAR_FIELD_TYPE);
$oCriteria->add(ProcessVariablesPeer::PRJ_UID, $sProcessUID);
$oDataset = DynaformPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
while ($oDataset->next()) {
$row = $oDataset->getRow();
array_push($aFields, array(
"sName" => $row["VAR_NAME"],
"sType" => $row["VAR_FIELD_TYPE"],
"sLabel" => $row["VAR_NAME"] . " [" . $row["VAR_FIELD_TYPE"] . "]"
));
}
} else {
require_once 'classes/model/Dynaform.php'; require_once 'classes/model/Dynaform.php';
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );
$oCriteria->addSelectColumn( DynaformPeer::DYN_FILENAME ); $oCriteria->addSelectColumn( DynaformPeer::DYN_FILENAME );
@@ -417,6 +442,7 @@ function getDynaformsVars ($sProcessUID, $bSystemVars = true, $bIncMulSelFields
} }
$oDataset->next(); $oDataset->next();
} }
}
return $aFields; return $aFields;
} }