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

Merge remote-tracking branch 'origin/feature/PMCORE-3049' into feature/PMCORE-3224

Browse Source
This commit is contained in:
Rodrigo Quelca
2021-08-19 14:09:08 +00:00
parent 84210e5dd8 7cbba5190c
commit 391397b17d
8 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/model/map/StepTriggerMapBuilder.php
View File

@@ -73,7 +73,7 @@ class StepTriggerMapBuilder
$tMap->addPrimaryKey('ST_TYPE', 'StType', 'string', CreoleTypes::VARCHAR, true, 20);
$tMap->addColumn('ST_CONDITION', 'StCondition', 'string', CreoleTypes::VARCHAR, true, 255);
$tMap->addColumn('ST_CONDITION', 'StCondition', 'string', CreoleTypes::LONGVARCHAR, true, null);
$tMap->addColumn('ST_POSITION', 'StPosition', 'int', CreoleTypes::INTEGER, true, null);

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.
* @var string
*/
protected $act_loop_type = 'NONE';
protected $act_loop_type = 'EMPTY';
/**
* The value for the act_test_before field.
@@ -870,7 +870,7 @@ abstract class BaseBpmnActivity extends BaseObject implements Persistent
$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->modifiedColumns[] = BpmnActivityPeer::ACT_LOOP_TYPE;
}

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

@@ -55,7 +55,7 @@ abstract class BaseStepTrigger extends BaseObject implements Persistent
* The value for the st_condition field.
* @var string
*/
protected $st_condition = '';
protected $st_condition;
/**
* The value for the st_position field.
@@ -246,7 +246,7 @@ abstract class BaseStepTrigger extends BaseObject implements Persistent
$v = (string) $v;
}
if ($this->st_condition !== $v || $v === '') {
if ($this->st_condition !== $v) {
$this->st_condition = $v;
$this->modifiedColumns[] = StepTriggerPeer::ST_CONDITION;
}

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

@@ -1385,7 +1385,7 @@
<column name="TAS_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
<column name="TRI_UID" type="VARCHAR" size="32" required="true" primaryKey="true" default=""/>
<column name="ST_TYPE" type="VARCHAR" size="20" required="true" primaryKey="true" default=""/>
<column name="ST_CONDITION" type="VARCHAR" size="255" required="true" default=""/>
<column name="ST_CONDITION" type="LONGVARCHAR" required="true"/>
<column name="ST_POSITION" type="INTEGER" required="true" default="0"/>
<validator column="ST_TYPE">
<rule name="validValues" value="BEFORE|AFTER"
@@ -3815,7 +3815,7 @@
<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="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_LOOP_MAXIMUM" type="INTEGER" required="false" default="0"/>
<column name="ACT_LOOP_CONDITION" type="VARCHAR" size="100" required="false"/>

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

@@ -650,7 +650,7 @@ CREATE TABLE `STEP_TRIGGER`
`TAS_UID` VARCHAR(32) default '' NOT NULL,
`TRI_UID` VARCHAR(32) default '' NOT NULL,
`ST_TYPE` VARCHAR(20) default '' NOT NULL,
`ST_CONDITION` VARCHAR(255) default '' NOT NULL,
`ST_CONDITION` MEDIUMTEXT NOT NULL,
`ST_POSITION` INTEGER default 0 NOT NULL,
PRIMARY KEY (`STEP_UID`,`TAS_UID`,`TRI_UID`,`ST_TYPE`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8';
@@ -1918,7 +1918,7 @@ CREATE TABLE `BPMN_ACTIVITY`
`ACT_INSTANTIATE` TINYINT default 0,
`ACT_SCRIPT_TYPE` VARCHAR(255),
`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_LOOP_MAXIMUM` INTEGER default 0,
`ACT_LOOP_CONDITION` VARCHAR(100),

2
workflow/engine/src/ProcessMaker/BusinessModel/Cases/Search.php
View File

@@ -172,7 +172,7 @@ class Search extends AbstractCases
switch ($status) {
case 'DRAFT':
case 'TO_DO':
$taskPending = Delegation::getPendingThreads($item['APP_NUMBER']);
$taskPending = Delegation::getPendingThreads($item['APP_NUMBER'], false);
break;
case 'COMPLETED':
case 'CANCELLED':

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(