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

Merged 3.0.1.8 into MT-10

Browse Source
This commit is contained in:
Gustavo Cruz
2016-04-01 13:37:42 -04:00
parent f9e3c05d97 8db5aa3418
commit fcbc47c2a2
16 changed files with 164 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
workflow/engine/controllers/home.php
View File

@@ -426,12 +426,27 @@ class Home extends Controller
$dataList['dir'] = $dir;
$dataList['sort'] = $sort;
$dataList['category'] = $category;
$dataList['action'] = $type;
/*----------------------------------********---------------------------------*/
if (true) {
//In enterprise version this block of code should always be executed
//In community version this block of code is deleted and is executed the other
$list = new \ProcessMaker\BusinessModel\Lists();
$cases = $list->getList('inbox', $dataList);
$listName = 'inbox';
switch ($type) {
case 'draft':
case 'todo':
$listName = 'inbox';
$cases = $list->getList($listName, $dataList);
break;
case 'unassigned':
$case = new \ProcessMaker\BusinessModel\Cases();
$cases = $case->getList($dataList);
foreach ($cases['data'] as &$value) {
$value = array_change_key_case($value, CASE_UPPER);
}
break;
}
} else {
/*----------------------------------********---------------------------------*/
$case = new \ProcessMaker\BusinessModel\Cases();
@@ -439,14 +454,14 @@ class Home extends Controller
foreach ($cases['data'] as &$value) {
$value = array_change_key_case($value, CASE_UPPER);
}
if(!isset($cases['totalCount'])){
$cases['totalCount'] = $cases['total'];
}
/*----------------------------------********---------------------------------*/
}
/*----------------------------------********---------------------------------*/
}
if(!isset($cases['totalCount'])){
$cases['totalCount'] = $cases['total'];
}
// formating & complitting apps data with 'Notes'
foreach ($cases['data'] as $i => $row) {