fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki 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

4
workflow/engine/classes/model/om/BaseBpmnActivity.php
View File

@@ -109,7 +109,7 @@ abstract class BaseBpmnActivity extends BaseObject implements Persistent
* The value for the act_loop_type field. * The value for the act_loop_type field.
* @var string * @var string
*/ */
protected $act_loop_type = 'NONE'; protected $act_loop_type = 'EMPTY';
/** /**
* The value for the act_test_before field. * The value for the act_test_before field.
@@ -870,7 +870,7 @@ abstract class BaseBpmnActivity extends BaseObject implements Persistent
$v = (string) $v; $v = (string) $v;
} }
if ($this->act_loop_type !== $v || $v === 'NONE') { if ($this->act_loop_type !== $v || $v === 'EMPTY') {
$this->act_loop_type = $v; $this->act_loop_type = $v;
$this->modifiedColumns[] = BpmnActivityPeer::ACT_LOOP_TYPE; $this->modifiedColumns[] = BpmnActivityPeer::ACT_LOOP_TYPE;
} }

2
workflow/engine/config/schema.xml
View File

@@ -3815,7 +3815,7 @@
<column name="ACT_INSTANTIATE" type="TINYINT" required="false" default="0"/> <column name="ACT_INSTANTIATE" type="TINYINT" required="false" default="0"/>
<column name="ACT_SCRIPT_TYPE" type="VARCHAR" size="255" required="false"/> <column name="ACT_SCRIPT_TYPE" type="VARCHAR" size="255" required="false"/>
<column name="ACT_SCRIPT" type="LONGVARCHAR" required="false"/> <column name="ACT_SCRIPT" type="LONGVARCHAR" required="false"/>
<column name="ACT_LOOP_TYPE" type="VARCHAR" size="20" required="true" default="NONE"/> <column name="ACT_LOOP_TYPE" type="VARCHAR" size="20" required="true" default="EMPTY"/>
<column name="ACT_TEST_BEFORE" type="TINYINT" required="false" default="0"/> <column name="ACT_TEST_BEFORE" type="TINYINT" required="false" default="0"/>
<column name="ACT_LOOP_MAXIMUM" type="INTEGER" required="false" default="0"/> <column name="ACT_LOOP_MAXIMUM" type="INTEGER" required="false" default="0"/>
<column name="ACT_LOOP_CONDITION" type="VARCHAR" size="100" required="false"/> <column name="ACT_LOOP_CONDITION" type="VARCHAR" size="100" required="false"/>

2
workflow/engine/data/mysql/schema.sql
View File

@@ -1918,7 +1918,7 @@ CREATE TABLE `BPMN_ACTIVITY`
`ACT_INSTANTIATE` TINYINT default 0, `ACT_INSTANTIATE` TINYINT default 0,
`ACT_SCRIPT_TYPE` VARCHAR(255), `ACT_SCRIPT_TYPE` VARCHAR(255),
`ACT_SCRIPT` MEDIUMTEXT, `ACT_SCRIPT` MEDIUMTEXT,
`ACT_LOOP_TYPE` VARCHAR(20) default 'NONE' NOT NULL, `ACT_LOOP_TYPE` VARCHAR(20) default 'EMPTY' NOT NULL,
`ACT_TEST_BEFORE` TINYINT default 0, `ACT_TEST_BEFORE` TINYINT default 0,
`ACT_LOOP_MAXIMUM` INTEGER default 0, `ACT_LOOP_MAXIMUM` INTEGER default 0,
`ACT_LOOP_CONDITION` VARCHAR(100), `ACT_LOOP_CONDITION` VARCHAR(100),

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