fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-2039

Browse Source
This commit is contained in:
Victor Saisa Lopez
2015-04-16 08:42:22 -04:00
parent 232181557a b2b421f039
commit e391de3dde
41 changed files with 1424 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -449,24 +449,9 @@ class Cases
}
//Get data
$arrayStatusInfo = $this->getStatusInfo($applicationUid);
$applicationStatus = "";
$delIndex = 0;
$flagUseDelIndex = false;
if (count($arrayStatusInfo) > 0) {
$applicationStatus = $arrayStatusInfo["APP_STATUS"];
$delIndex = $arrayStatusInfo["DEL_INDEX"];
if (in_array($applicationStatus, array("DRAFT", "PAUSED", "CANCELLED"))) {
$flagUseDelIndex = true;
}
}
$ws = new \wsBase();
$fields = $ws->getCaseInfo($applicationUid, $delIndex, $flagUseDelIndex);
$fields = $ws->getCaseInfo($applicationUid, 0);
$array = json_decode(json_encode($fields), true);
if ($array ["status_code"] != 0) {
@@ -475,7 +460,7 @@ class Cases
$array['app_uid'] = $array['caseId'];
$array['app_number'] = $array['caseNumber'];
$array['app_name'] = $array['caseName'];
$array["app_status"] = ($applicationStatus != "")? $applicationStatus : $array["caseStatus"];
$array["app_status"] = $array["caseStatus"];
$array['app_init_usr_uid'] = $array['caseCreatorUser'];
$array['app_init_usr_username'] = trim($array['caseCreatorUserName']);
$array['pro_uid'] = $array['processId'];

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

@@ -384,7 +384,7 @@ class Task
$result = $task->update($arrayProperty);
if (!empty($arrayProperty['CONSOLIDATE_DATA'])) {
if (isset($arrayProperty['CONSOLIDATE_DATA']['consolidated_dynaform'])) {
if (!empty($arrayProperty['CONSOLIDATE_DATA']['consolidated_dynaform'])) {
G::LoadClass("consolidatedCases");
$consolidated = new \ConsolidatedCases();
$dataConso = array(