From 7d71e039f92847f7b7add2fd8b09b448983f807b Mon Sep 17 00:00:00 2001 From: Victor Saisa Lopez Date: Thu, 27 Feb 2014 11:55:49 -0400 Subject: [PATCH 1/2] ProcessMaker-MA "Web Entry (fix)" - Se ha agregado un fix, al tratar de hacer el update en la tabla EVENT --- .../engine/src/BusinessModel/WebEntry.php | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/workflow/engine/src/BusinessModel/WebEntry.php b/workflow/engine/src/BusinessModel/WebEntry.php index 95157a278..92d5fd582 100644 --- a/workflow/engine/src/BusinessModel/WebEntry.php +++ b/workflow/engine/src/BusinessModel/WebEntry.php @@ -305,6 +305,8 @@ class WebEntry $arrayTaskData = $task->load($arrayData["TAS_UID"]); + $weEventUid = $task->getStartingEvent($arrayData["TAS_UID"]); + if ($arrayTaskData["TAS_START"] == "FALSE") { throw (new \Exception(str_replace(array("{0}"), array($arrayTaskData["TAS_TITLE"]), "The task \"{0}\" isn't initial task"))); } @@ -377,10 +379,6 @@ class WebEntry $usrUsername = $arrayData["USR_USERNAME"]; $usrPassword = $arrayData["USR_PASSWORD"]; - $task = new \Task(); - - $weEventUid = $task->getStartingEvent($taskUid); - //Creating sys.info; $site_public_path = ""; @@ -458,16 +456,20 @@ class WebEntry } //Event - $event = new \Event(); + try { + $event = new \Event(); - $arrayEventData = array(); + $arrayEventData = array(); - $arrayEventData["EVN_UID"] = $weEventUid; - $arrayEventData["EVN_RELATED_TO"] = "MULTIPLE"; - $arrayEventData["EVN_ACTION"] = $dynaFormUid; - $arrayEventData["EVN_CONDITIONS"] = $usrUsername; + $arrayEventData["EVN_UID"] = $weEventUid; + $arrayEventData["EVN_RELATED_TO"] = "MULTIPLE"; + $arrayEventData["EVN_ACTION"] = $dynaFormUid; + $arrayEventData["EVN_CONDITIONS"] = $usrUsername; - $result = $event->update($arrayEventData); + $result = $event->update($arrayEventData); + } catch (\Exception $e2) { + // + } //Data $url = $http . $_SERVER["HTTP_HOST"] . "/sys" . SYS_SYS . "/" . SYS_LANG . "/" . SYS_SKIN . "/" . $processUid . "/" . $dynTitle . ".php"; From ec67ede87de80b9413f24c2421c600b13da1b09a Mon Sep 17 00:00:00 2001 From: Victor Saisa Lopez Date: Thu, 27 Feb 2014 12:15:56 -0400 Subject: [PATCH 2/2] ProcessMaker-MA "Web Entry (fix)" - Se ha agregado un fix, al tratar de hacer el update en la tabla EVENT --- workflow/engine/src/BusinessModel/WebEntry.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/workflow/engine/src/BusinessModel/WebEntry.php b/workflow/engine/src/BusinessModel/WebEntry.php index 92d5fd582..f85acddeb 100644 --- a/workflow/engine/src/BusinessModel/WebEntry.php +++ b/workflow/engine/src/BusinessModel/WebEntry.php @@ -456,7 +456,7 @@ class WebEntry } //Event - try { + if ($weEventUid != "") { $event = new \Event(); $arrayEventData = array(); @@ -467,8 +467,6 @@ class WebEntry $arrayEventData["EVN_CONDITIONS"] = $usrUsername; $result = $event->update($arrayEventData); - } catch (\Exception $e2) { - // } //Data