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

PMCORE-1476

Browse Source
This commit is contained in:
Paula Quispe
2020-05-14 17:55:52 -04:00
parent 2662c535cb
commit 3e23072618
3 changed files with 105 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
workflow/engine/classes/Processes.php
View File

@@ -1,6 +1,7 @@
<?php
use ProcessMaker\BusinessModel\EmailEvent;
use ProcessMaker\BusinessModel\Variable as BmVariable;
use ProcessMaker\Core\System;
class Processes
@@ -1863,8 +1864,21 @@ class Processes
$criteria = new Criteria(ProcessVariablesPeer::DATABASE_NAME);
$criteria->add(ProcessVariablesPeer::VAR_UID, $row['VAR_UID']);
$criteria->add(ProcessVariablesPeer::PRJ_UID, $row['PRJ_UID']);
// Load the PRO_ID
$process = new Process();
if ($process->processExists($row['PRJ_UID'])) {
$processRow = $process->load($row['PRJ_UID']);
$row['PRO_ID'] = $processRow['PRO_ID'];
if (!empty($row['PRO_ID'])) {
$criteria->add(ProcessVariablesPeer::PRO_ID, $row['PRO_ID']);
}
}
$criteria->add(ProcessVariablesPeer::VAR_NAME, $row['VAR_NAME']);
$criteria->add(ProcessVariablesPeer::VAR_FIELD_TYPE, $row['VAR_FIELD_TYPE']);
if (empty($row['VAR_FIELD_TYPE_ID'])) {
$row['VAR_FIELD_TYPE_ID'] = BmVariable::$varTypesValues[$row["VAR_FIELD_TYPE"]];
}
$criteria->add(ProcessVariablesPeer::VAR_FIELD_TYPE_ID, $row['VAR_FIELD_TYPE_ID']);
$criteria->add(ProcessVariablesPeer::VAR_FIELD_SIZE, $row['VAR_FIELD_SIZE']);
$criteria->add(ProcessVariablesPeer::VAR_LABEL, $row['VAR_LABEL']);
$criteria->add(ProcessVariablesPeer::VAR_DBCONNECTION, $row['VAR_DBCONNECTION']);
@@ -3609,6 +3623,8 @@ class Processes
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
while ($aRow = $oDataset->getRow()) {
unset($aRow['VAR_ID']);
unset($aRow['PRO_ID']);
$aVars[] = $aRow;
$oDataset->next();
}