Merged in victorsl/processmaker (pull request #253)
ProcessMaker-MA "Web Entry (fix)"
This commit is contained in:
@@ -305,6 +305,8 @@ class WebEntry
|
|||||||
|
|
||||||
$arrayTaskData = $task->load($arrayData["TAS_UID"]);
|
$arrayTaskData = $task->load($arrayData["TAS_UID"]);
|
||||||
|
|
||||||
|
$weEventUid = $task->getStartingEvent($arrayData["TAS_UID"]);
|
||||||
|
|
||||||
if ($arrayTaskData["TAS_START"] == "FALSE") {
|
if ($arrayTaskData["TAS_START"] == "FALSE") {
|
||||||
throw (new \Exception(str_replace(array("{0}"), array($arrayTaskData["TAS_TITLE"]), "The task \"{0}\" isn't initial task")));
|
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"];
|
$usrUsername = $arrayData["USR_USERNAME"];
|
||||||
$usrPassword = $arrayData["USR_PASSWORD"];
|
$usrPassword = $arrayData["USR_PASSWORD"];
|
||||||
|
|
||||||
$task = new \Task();
|
|
||||||
|
|
||||||
$weEventUid = $task->getStartingEvent($taskUid);
|
|
||||||
|
|
||||||
//Creating sys.info;
|
//Creating sys.info;
|
||||||
$site_public_path = "";
|
$site_public_path = "";
|
||||||
|
|
||||||
@@ -458,16 +456,18 @@ class WebEntry
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Event
|
//Event
|
||||||
$event = new \Event();
|
if ($weEventUid != "") {
|
||||||
|
$event = new \Event();
|
||||||
|
|
||||||
$arrayEventData = array();
|
$arrayEventData = array();
|
||||||
|
|
||||||
$arrayEventData["EVN_UID"] = $weEventUid;
|
$arrayEventData["EVN_UID"] = $weEventUid;
|
||||||
$arrayEventData["EVN_RELATED_TO"] = "MULTIPLE";
|
$arrayEventData["EVN_RELATED_TO"] = "MULTIPLE";
|
||||||
$arrayEventData["EVN_ACTION"] = $dynaFormUid;
|
$arrayEventData["EVN_ACTION"] = $dynaFormUid;
|
||||||
$arrayEventData["EVN_CONDITIONS"] = $usrUsername;
|
$arrayEventData["EVN_CONDITIONS"] = $usrUsername;
|
||||||
|
|
||||||
$result = $event->update($arrayEventData);
|
$result = $event->update($arrayEventData);
|
||||||
|
}
|
||||||
|
|
||||||
//Data
|
//Data
|
||||||
$url = $http . $_SERVER["HTTP_HOST"] . "/sys" . SYS_SYS . "/" . SYS_LANG . "/" . SYS_SKIN . "/" . $processUid . "/" . $dynTitle . ".php";
|
$url = $http . $_SERVER["HTTP_HOST"] . "/sys" . SYS_SYS . "/" . SYS_LANG . "/" . SYS_SKIN . "/" . $processUid . "/" . $dynTitle . ".php";
|
||||||
|
|||||||
Reference in New Issue
Block a user