fernando/luos
1
0
Fork 0
Code Releases Activity

solve conflicts

Browse Source
This commit is contained in:
Rodrigo Quelca
2019-05-17 11:16:18 -04:00
parent ad86c367f6 8252428a0c
commit 81aaae594a
218 changed files with 11380 additions and 9660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1427,4 +1427,31 @@ class Cases extends Api
return $response;
}
/**
* Return information for sub process cases
*
* @url GET /:app_uid/sub-process-cases
*
* @param string $app_uid {@min 32}{@max 32}
*
* @return array
* @throws Exception
*
* @access protected
* @class AccessControl {@permission PM_CASES}
*/
public function doGetCaseSubProcess($app_uid)
{
try {
$case = new BmCases();
$case->setFormatFieldNameInUppercase(false);
$caseInfo = $case->getCaseInfoSubProcess($app_uid, $this->getUserId());
$caseInfo = DateTime::convertUtcToIso8601($caseInfo, $this->arrayFieldIso8601);
return $caseInfo;
} catch (Exception $e) {
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());
}
}
}

2
workflow/engine/src/ProcessMaker/Services/Api/Light.php
View File

@@ -1038,6 +1038,7 @@ class Light extends Api
}
$userUid = $this->getUserId();
//@todo Find a better way to define session variables
$_SESSION["APPLICATION"] = $app_uid;
$_SESSION["PROCESS"] = $pro_uid;
//$_SESSION["TASK"] = "";
@@ -2009,6 +2010,7 @@ class Light extends Api
if ($alreadyRouted) {
throw (new RestException(Api::STAT_APP_EXCEPTION, G::LoadTranslation('ID_CASE_DELEGATION_ALREADY_CLOSED')));
}
//@todo Find a better way to define session variables
$_SESSION["APPLICATION"] = $app_uid;
$_SESSION["PROCESS"] = $pro_uid;
$_SESSION["INDEX"] = $app_index;