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

Merged in victorsl/processmaker/PM-1913 (pull request #1756)

Browse Source 
PM-1913 "0017035: Change error message for REST endpoint..." SOLVED
This commit is contained in:
Julio Cesar Laura Avendaño
2015-03-24 19:19:33 -04:00
parent c94c17bbea a679346ab9
commit f5a0e75618
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -528,8 +528,25 @@ class Cases
public function getTaskCase($applicationUid, $userUid)
{
try {
$result = array ();
\G::LoadClass('wsBase');
//Verify data
$this->throwExceptionIfNotExistsCase($applicationUid, $this->getFieldNameByFormatFieldName("APP_UID"));
$criteria = new \Criteria("workflow");
$criteria->addSelectColumn(\ApplicationPeer::APP_UID);
$criteria->add(\ApplicationPeer::APP_UID, $applicationUid, \Criteria::EQUAL);
$criteria->add(\ApplicationPeer::APP_STATUS, "COMPLETED", \Criteria::EQUAL);
$rsCriteria = \ApplicationPeer::doSelectRS($criteria);
if ($rsCriteria->next()) {
throw new \Exception(\G::LoadTranslation("ID_CASE_NO_CURRENT_TASKS_BECAUSE_CASE_ITS_COMPLETED", array($this->getFieldNameByFormatFieldName("APP_UID"), $applicationUid)));
}
//Get data
$result = array();
$oCriteria = new \Criteria( 'workflow' );
$del = \DBAdapter::getStringDelimiter();
$oCriteria->addSelectColumn( \AppDelegationPeer::DEL_INDEX );

12
workflow/engine/src/ProcessMaker/Services/Api/Cases.php
View File

@@ -616,10 +616,14 @@ class Cases extends Api
public function doGetTaskCase($app_uid)
{
try {
$userUid = $this->getUserId();
$cases = new \ProcessMaker\BusinessModel\Cases();
$oData = $cases->getTaskCase($app_uid, $userUid);
return $oData;
$case = new \ProcessMaker\BusinessModel\Cases();
$case->setFormatFieldNameInUppercase(false);
$arrayData = $case->getTaskCase($app_uid, $this->getUserId());
$response = $arrayData;
return $response;
} catch (\Exception $e) {
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
}