fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in qronald/processmaker/HOR-1071 (pull request #4589)

Browse Source 
HOR-1071
This commit is contained in:
Julio Cesar Laura Avendaño
2016-07-19 17:02:14 -04:00
parent 59973f49d0 06b4aa71f5
commit 53821c617e
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
View File

@@ -1480,7 +1480,7 @@ class BpmnWorkflow extends Project\Bpmn
$uidOld = $lanesetData["LNS_UID"]; $uidOld = $lanesetData["LNS_UID"];
$lanesetData["LNS_UID"] = Util\Common::generateUID(); $lanesetData["LNS_UID"] = Util\Common::generateUID();
$diagram = self::refreshElementUid($diagram, $uidOld, $lanesetData["LNS_UID"]);
$result[] = array( $result[] = array(
"object" => "laneset", "object" => "laneset",
"old_uid" => $uidOld, "old_uid" => $uidOld,
@@ -1515,13 +1515,6 @@ class BpmnWorkflow extends Project\Bpmn
foreach ($diagram["lanes"] as $i => $laneData) { foreach ($diagram["lanes"] as $i => $laneData) {
$laneData = array_change_key_case($laneData, CASE_UPPER); $laneData = array_change_key_case($laneData, CASE_UPPER);
//Update UIDs
foreach ($result as $value) {
if ($laneData["LNS_UID"] == $value["old_uid"]) {
$laneData["LNS_UID"] = $value["new_uid"];
}
}
$dataObject = $bwp->getLane($laneData["LAN_UID"]); $dataObject = $bwp->getLane($laneData["LAN_UID"]);
if ($forceInsert || is_null($dataObject)) { if ($forceInsert || is_null($dataObject)) {
@@ -1531,7 +1524,7 @@ class BpmnWorkflow extends Project\Bpmn
$uidOld = $laneData["LAN_UID"]; $uidOld = $laneData["LAN_UID"];
$laneData["LAN_UID"] = Util\Common::generateUID(); $laneData["LAN_UID"] = Util\Common::generateUID();
$diagram = self::refreshElementUid($diagram, $uidOld, $laneData["LAN_UID"]);
$result[] = array( $result[] = array(
"object" => "lane", "object" => "lane",
"old_uid" => $uidOld, "old_uid" => $uidOld,
@@ -2046,5 +2039,24 @@ class BpmnWorkflow extends Project\Bpmn
throw $e; throw $e;
} }
} }
public static function refreshElementUid($diagram, $oldUid, $newUid)
{
array_walk_recursive(
$diagram,
function (&$value, $key, $arrayData)
{
try {
if (strcmp($arrayData['oldUid'], $value) === 0){
$value = $arrayData['newUid'];
}
} catch (\Exception $e) {
throw $e;
}
},
['oldUid' => $oldUid, 'newUid' => $newUid]
);
return $diagram;
}
} }