fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'upstream/3.0.1.8' into OM-641

Browse Source
This commit is contained in:
alex_santos
2016-04-29 18:05:38 -04:00
parent 36082ec9bb 5eeb6533af
commit b445f5232d
2 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
workflow/engine/classes/class.case.php
View File

@@ -1007,8 +1007,16 @@ class Cases
$fieldsOnBoth = @array_intersect_assoc($FieldsBefore['APP_DATA'], $aApplicationFields);
//Add fields that weren't in previous version
foreach ($aApplicationFields as $key => $value) {
if (!(isset($fieldsOnBoth[$key]))) {
$FieldsDifference[$key] = $value;
if (is_array($value) && is_array($fieldsOnBoth[$key])){
$afieldDifference = $this->arrayRecursiveDiff($value,$fieldsOnBoth[$key]);
$dfieldDifference = $this->arrayRecursiveDiff($fieldsOnBoth[$key],$value);
if ($afieldDifference || $dfieldDifference){
$FieldsDifference[$key] = $value;
}
} else {
if (!(isset($fieldsOnBoth[$key]))) {
$FieldsDifference[$key] = $value;
}
}
}
if ((is_array($FieldsDifference)) && (count($FieldsDifference) > 0)) {

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

@@ -1478,6 +1478,47 @@ class Light extends Api
return $response;
}
/**
* Get Case Variables
*
* @param string $app_uid {@min 1}{@max 32}
*
* @url GET /:app_uid/variables
*/
public function doGetCaseVariables($app_uid)
{
try {
$usr_uid = $this->getUserId();
$cases = new \ProcessMaker\BusinessModel\Cases();
$response = $cases->getCaseVariables($app_uid, $usr_uid);
return DateTime::convertUtcToTimeZone($response);
} catch (\Exception $e) {
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
}
}
/**
* Put Case Variables
*
* @param string $app_uid {@min 1}{@max 32}
* @param array $request_data
* @param string $dyn_uid {@from path}
* @param string $del_index {@from path}
*
* @url PUT /:app_uid/variable
*/
public function doPutCaseVariables($app_uid, $request_data, $dyn_uid = '', $del_index = 0)
{
try {
$usr_uid = $this->getUserId();
$cases = new \ProcessMaker\BusinessModel\Cases();
$request_data = \ProcessMaker\Util\DateTime::convertDataToUtc($request_data);
$cases->setCaseVariables($app_uid, $request_data, $dyn_uid, $usr_uid, $del_index);
} catch (\Exception $e) {
throw (new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()));
}
}
/**
* Get in base64 the image process (processmap)
*