fernando/luos
1
0
Fork 0
Code Releases Activity

PMCORE-562

Browse Source
This commit is contained in:
Andrea Adamczyk
2021-08-05 17:15:56 -04:00
parent e8c7b04f5a
commit 1ac0f1789c
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1316,7 +1316,7 @@ class BpmnWorkflow extends Project\Bpmn
$diagramData = array_change_key_case($projectData["diagrams"][0], CASE_UPPER);
if ($generateUid) {
$result[1]["old_uid"] = $diagramData["DIA_UID"];
$result[1]["old_uid"] = isset($diagramData["DIA_UID"]) ? $diagramData["DIA_UID"] : '';
$diagramData["DIA_UID"] = Util\Common::generateUID();
$result[1]["new_uid"] = $diagramData["DIA_UID"];
$result[1]["object"] = "diagram";
@@ -1408,13 +1408,15 @@ class BpmnWorkflow extends Project\Bpmn
try {
unset($arrayObjectData["BOU_UID"]);
if ($arrayObjectData["BOU_CONTAINER"] == "bpmnPool" ||
if (isset($arrayObjectData["BOU_CONTAINER"])) {
if ($arrayObjectData["BOU_CONTAINER"] == "bpmnPool" ||
$arrayObjectData["BOU_CONTAINER"] == "bpmnLane" ||
$arrayObjectData["BOU_CONTAINER"] == "bpmnActivity"
) {
foreach ($arrayUid as $value) {
if ($arrayObjectData["BOU_ELEMENT"] == $value["old_uid"]) {
$arrayObjectData["BOU_ELEMENT"] = $value["new_uid"];
) {
foreach ($arrayUid as $value) {
if ($arrayObjectData["BOU_ELEMENT"] == $value["old_uid"]) {
$arrayObjectData["BOU_ELEMENT"] = $value["new_uid"];
}
}
}
}
@@ -1615,13 +1617,13 @@ class BpmnWorkflow extends Project\Bpmn
unset($activityData["_EXTENDED"], $activityData["BOU_ELEMENT_ID"]);
$activityData = Util\ArrayUtil::boolToIntValues($activityData);
$activity = $bwp->getActivity($activityData["ACT_UID"]);
$activity = $bwp->getActivity(isset($activityData["ACT_UID"]) ? $activityData["ACT_UID"] : '');
if ($forceInsert || is_null($activity)) {
if ($generateUid) {
//Generate and update UID
$activityData = $bwp->updateBoundByArrayUid($activityData, $result);
$uidOld = $activityData["ACT_UID"];
$uidOld = isset($activityData["ACT_UID"]) ? $activityData["ACT_UID"] : '';
$activityData["ACT_UID"] = Util\Common::generateUID();
$result[] = array(