diff --git a/resources/assets/js/components/search/CasesFilter.vue b/resources/assets/js/components/search/CasesFilter.vue
index f02dfc69a..2987ccfb1 100644
--- a/resources/assets/js/components/search/CasesFilter.vue
+++ b/resources/assets/js/components/search/CasesFilter.vue
@@ -214,7 +214,10 @@ export default {
handler(newVal, oldVal) {
this.searchTags = [];
this.selected = [];
- this.setFilters(newVal);
+ if (newVal.length) {
+ this.setFilters(newVal, oldVal);
+ this.searchClickHandler();
+ }
}
}
},
@@ -272,17 +275,20 @@ export default {
* Set Filters and make the tag labels
* @param {object} filters json to manage the query
*/
- setFilters(filters) {
+ setFilters(filters, oldVal) {
let self = this;
_.forEach(filters, function (item, key) {
let component = _.find(self.filterItems, function (o) {
return o.id === item.fieldId;
});
if (component) {
- self.searchTags.push(component.id);
- self.selected = component.id;
- self.itemModel[component.id] = component;
- self.itemModel[component.id].autoShow = typeof item.autoShow !== "undefined" ? item.autoShow : true
+ self.searchTags.push(component.id);
+ self.selected.push(component.id);
+ self.itemModel[component.id] = component;
+ self.itemModel[component.id].autoShow = typeof item.autoShow !== "undefined" ? item.autoShow : true;
+ if (!oldVal.length) {
+ self.updateSearchTag(item);
+ }
}
if(item.fieldId === "processName") {
self.searchTags.push(self.processName.id);
diff --git a/workflow/engine/classes/model/map/StepTriggerMapBuilder.php b/workflow/engine/classes/model/map/StepTriggerMapBuilder.php
index 5ee3667be..ef927f666 100644
--- a/workflow/engine/classes/model/map/StepTriggerMapBuilder.php
+++ b/workflow/engine/classes/model/map/StepTriggerMapBuilder.php
@@ -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);
diff --git a/workflow/engine/classes/model/om/BaseBpmnActivity.php b/workflow/engine/classes/model/om/BaseBpmnActivity.php
index fee1ba3ce..b409d27a7 100644
--- a/workflow/engine/classes/model/om/BaseBpmnActivity.php
+++ b/workflow/engine/classes/model/om/BaseBpmnActivity.php
@@ -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;
}
diff --git a/workflow/engine/classes/model/om/BaseStepTrigger.php b/workflow/engine/classes/model/om/BaseStepTrigger.php
index 52e62f2dd..7630714a5 100644
--- a/workflow/engine/classes/model/om/BaseStepTrigger.php
+++ b/workflow/engine/classes/model/om/BaseStepTrigger.php
@@ -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;
}
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 27e16ae9d..277e4f3c8 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -1385,7 +1385,7 @@
-
+
-
+
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index cd1647c3c..369bb9af2 100644
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -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),
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Search.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Search.php
index 2c3b4bf01..16f1cb16c 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Search.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Search.php
@@ -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':
diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
index 12c997f6c..f928a47c2 100644
--- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
+++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
@@ -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(