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

Updates before update on BpmnWorkflow Adapter

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2014-02-19 19:32:19 -04:00
parent 76d83bc376
commit 00ebbeff0d
4 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,13 +116,6 @@ class BpmnWorkflow extends Project\Bpmn
public function updateActivity($actUid, $data)
{
unset($data["BOU_ELEMENT_ID"]);
if (! self::isModified("activity", $actUid, $data)) {
self::log("Update Activity: $actUid (No Changes)");
return false;
}
parent::updateActivity($actUid, $data);
$taskData = array();
@@ -235,14 +228,6 @@ class BpmnWorkflow extends Project\Bpmn
public function updateEvent($evnUid, $data)
{
$data["EVN_CANCEL_ACTIVITY"] = $data["EVN_CANCEL_ACTIVITY"] ? 1 : 0;
$data["EVN_WAIT_FOR_COMPLETION"] = $data["EVN_WAIT_FOR_COMPLETION"] ? 1 : 0;
if (! self::isModified("event", $evnUid, $data)) {
self::log("Update Event: $evnUid (No Changes)");
return false;
}
parent::updateEvent($evnUid, $data);
}

9
workflow/engine/src/ProcessMaker/Project/Bpmn.php
View File

@@ -386,8 +386,13 @@ class Bpmn extends Handler
public function updateEvent($evnUid, $data)
{
$data["EVN_CANCEL_ACTIVITY"] = $data["EVN_CANCEL_ACTIVITY"] ? 1 : 0;
$data["EVN_WAIT_FOR_COMPLETION"] = $data["EVN_WAIT_FOR_COMPLETION"] ? 1 : 0;
if (array_key_exists("EVN_CANCEL_ACTIVITY", $data)) {
$data["EVN_CANCEL_ACTIVITY"] = $data["EVN_CANCEL_ACTIVITY"] ? 1 : 0;
}
if (array_key_exists("EVN_WAIT_FOR_COMPLETION", $data)) {
$data["EVN_WAIT_FOR_COMPLETION"] = $data["EVN_WAIT_FOR_COMPLETION"] ? 1 : 0;
}
try {
self::log("Update Event: $evnUid", "With data: ", $data);

10
workflow/engine/src/ProcessMaker/Project/Handler.php
View File

@@ -90,6 +90,16 @@ abstract class Handler
return $result;
}
public static function isEquals($array, $arrayCompare)
{
ksort($array);
ksort($arrayCompare);
self::log($array, $arrayCompare);
//$ret = array_diff_assoc($array, $arrayCompare);
return (self::getChecksum($array) === self::getChecksum($arrayCompare));
}
/**
* Log in ProcessMaker Standard Output if debug mode is enabled.
*