fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in luisfernandosl/processmaker/PM-3374 (pull request #2790)

Browse Source 
PM-3374
This commit is contained in:
Julio Cesar Laura Avendaño
2015-09-21 13:44:01 -04:00
parent 3ec47edc0a f0c75ce4a7
commit 1775f847a7
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/class.wsBase.php
View File

@@ -2688,6 +2688,10 @@ class wsBase
$oPMScript->setScript( $row['TRI_WEBBOT'] ); $oPMScript->setScript( $row['TRI_WEBBOT'] );
$oPMScript->execute(); $oPMScript->execute();
if (isset($oPMScript->aFields["__ERROR__"]) && trim($oPMScript->aFields["__ERROR__"]) != "" && $oPMScript->aFields["__ERROR__"] != "none") {
throw new Exception($oPMScript->aFields["__ERROR__"]);
}
//Save data - Start //Save data - Start
$appFields['APP_DATA'] = $oPMScript->aFields; $appFields['APP_DATA'] = $oPMScript->aFields;
unset($appFields['APP_STATUS']); unset($appFields['APP_STATUS']);

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

@@ -932,7 +932,11 @@ class Cases
} }
$case = new \wsBase(); $case = new \wsBase();
$case->executeTrigger( $usr_uid, $app_uid, $tri_uid, $del_index ); $result = $case->executeTrigger($usr_uid, $app_uid, $tri_uid, $del_index);
if ($result->status_code != 0) {
throw new \Exception($result->message);
}
} }
/** /**
@@ -1600,7 +1604,7 @@ class Cases
$_SESSION['APPLICATION'] = $app_uid; $_SESSION['APPLICATION'] = $app_uid;
$_SESSION['USER_LOGGED'] = $usr_uid; $_SESSION['USER_LOGGED'] = $usr_uid;
$case = new \Cases(); $case = new \Cases();
$fields = $case->loadCase($app_uid); $fields = $case->loadCase($app_uid);
$_POST['form'] = $app_data; $_POST['form'] = $app_data;