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

Merged in paulis/processmaker/MT-99 (pull request #4058)

Browse Source 
MT-99
This commit is contained in:
Julio Cesar Laura Avendaño
2016-04-06 17:18:13 -04:00
parent a934e24a03 2d0ff1ea50
commit d4f0c90712
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.processes.php
View File

@@ -1984,10 +1984,12 @@ class Processes
{ {
$map = array(); $map = array();
foreach ($oData->inputs as $key => $val) { foreach ($oData->inputs as $key => $val) {
$oldUid = $val['INP_DOC_UID'];
$newGuid = $this->getUnusedInputGUID(); $newGuid = $this->getUnusedInputGUID();
$map[$val['INP_DOC_UID']] = $newGuid; $map[$val['INP_DOC_UID']] = $newGuid;
$oData->inputFiles[$oData->inputs[$key]['INP_DOC_UID']] = $newGuid; $oData->inputFiles[$oData->inputs[$key]['INP_DOC_UID']] = $newGuid;
$oData->inputs[$key]['INP_DOC_UID'] = $newGuid; $oData->inputs[$key]['INP_DOC_UID'] = $newGuid;
$oData->inputs[$key]['INP_DOC_UID_OLD'] = $oldUid;
} }
if (!isset($oData->inputFiles)) { if (!isset($oData->inputFiles)) {
$oData->inputFiles = array(); $oData->inputFiles = array();

12
workflow/engine/src/ProcessMaker/Project/Workflow.php
View File

@@ -1317,6 +1317,18 @@ class Workflow extends Handler
} }
} }
foreach ($arrayWorkflowData["inputs"] as $keyin => $value) {
$newUid = $value["INP_DOC_UID"];
if(isset($value["INP_DOC_UID_OLD"])){
foreach ($arrayWorkflowData["processVariables"] as $keypv => $vars) {
if($vars['INP_DOC_UID'] === $value["INP_DOC_UID_OLD"]){
$arrayWorkflowData["processVariables"][$keypv]["INP_DOC_UID"] = $newUid;
}
}
unset($arrayWorkflowData["inputs"][$keyin]["INP_DOC_UID_OLD"]);
}
}
//Workflow files //Workflow files
foreach ($arrayWorkflowFile as $key => $value) { foreach ($arrayWorkflowFile as $key => $value) {
$arrayFile = $value; $arrayFile = $value;