fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/bugfix/HOR-3670' into bugfix/HOR-3670-HQ

Browse Source
This commit is contained in:
hjonathan
2017-08-11 15:25:44 -04:00
parent 4b3cf61a79 ff4dc753eb
commit 4c855dc8de
51 changed files with 196 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
View File

@@ -7,7 +7,7 @@ use CasesPeer;
use AppDelegation;
use ProcessMaker\Plugins\PluginRegistry;
use Exception;
use wsBase;
use WsBase;
use RBAC;
use Applications;
@@ -463,7 +463,7 @@ class Cases
if (!isset($row)) {
continue;
}
$ws = new wsBase();
$ws = new WsBase();
$fields = $ws->getCaseInfo($applicationUid, $row["DEL_INDEX"]);
$array = json_decode(json_encode($fields), true);
if ($array ["status_code"] != 0) {
@@ -530,7 +530,7 @@ class Cases
throw (new Exception($arrayData));
}
} else {
$ws = new wsBase();
$ws = new WsBase();
$fields = $ws->getCaseInfo($applicationUid, 0);
$array = json_decode(json_encode($fields), true);
@@ -676,7 +676,7 @@ class Cases
{
try {
$ws = new wsBase();
$ws = new WsBase();
if ($variables) {
$variables = array_shift($variables);
}
@@ -720,7 +720,7 @@ class Cases
{
try {
$ws = new wsBase();
$ws = new WsBase();
if ($variables) {
$variables = array_shift($variables);
} elseif ($variables == null) {
@@ -775,7 +775,7 @@ class Cases
$delIndex = AppDelegation::getCurrentIndex($applicationUid);
}
$ws = new wsBase();
$ws = new WsBase();
$fields = $ws->reassignCase($userUid, $applicationUid, $delIndex, $userUidSource, $userUidTarget);
$array = json_decode(json_encode($fields), true);
if (array_key_exists("status_code", $array)) {
@@ -1006,7 +1006,7 @@ class Cases
$RBAC->sSystem = 'PROCESSMAKER';
}
$case = new wsBase();
$case = new WsBase();
$result = $case->executeTrigger($userUid, $appUid, $triUid, $delIndex);
if ($result->status_code != 0) {
@@ -1073,7 +1073,7 @@ class Cases
}
}
$ws = new wsBase();
$ws = new WsBase();
$fields = $ws->derivateCase($userUid, $applicationUid, $delIndex, $bExecuteTriggersBeforeAssignment = false);
$array = json_decode(json_encode($fields), true);
if ($array ["status_code"] != 0) {

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

@@ -701,7 +701,7 @@ class InputDocument
throw new \Exception(\G::LoadTranslation("ID_CASES_INPUT_DOES_NOT_EXIST", array($inputDocumentUid)));
}
$ws = new \wsBase();
$ws = new \WsBase();
$ws->removeDocument($inputDocumentUid);
} catch (\Exception $e) {
throw $e;

2
workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php
View File

@@ -69,7 +69,7 @@ class Consolidated
*/
public function postDerivate($app_uid, $app_number, $del_index, $usr_uid, $fieldName = '', $fieldValue = '')
{
$ws = new \wsBase();
$ws = new \WsBase();
$oCase = new \Cases();
if (!isset($Fields["DEL_INIT_DATE"])) {

2
workflow/engine/src/ProcessMaker/BusinessModel/Light.php
View File

@@ -524,7 +524,7 @@ class Light
$delIndex = \AppDelegation::getCurrentIndex($applicationUid);
}
$ws = new \wsBase();
$ws = new \WsBase();
$fields = $ws->derivateCase($userUid, $applicationUid, $delIndex, $bExecuteTriggersBeforeAssignment = false, $tasks);
$array = json_decode(json_encode($fields), true);
$array['message'] = trim(strip_tags($array['message']));

2
workflow/engine/src/ProcessMaker/BusinessModel/MessageApplication.php
View File

@@ -368,7 +368,7 @@ class MessageApplication
try {
//Set variables
$ws = new \wsBase();
$ws = new \WsBase();
$case = new \Cases();
$common = new \ProcessMaker\Util\Common();
$sysSys = (defined("SYS_SYS"))? SYS_SYS : "Undefined";

2
workflow/engine/src/ProcessMaker/BusinessModel/Pmgmail.php
View File

@@ -357,7 +357,7 @@ class Pmgmail {
return false;
}
$ws = new \wsBase();
$ws = new \WsBase();
$resultMail = $ws->sendMessage(
$application['APP_UID'],
$defaultEmail, //From,

2
workflow/engine/src/ProcessMaker/BusinessModel/TimerEvent.php
View File

@@ -1211,7 +1211,7 @@ class TimerEvent
try {
//Set variables
$ws = new \wsBase();
$ws = new \WsBase();
$case = new \Cases();
$common = new \ProcessMaker\Util\Common();
$sysSys = (defined("SYS_SYS"))? SYS_SYS : "Undefined";