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

Merged in bugfix/HOR-3582 (pull request #5821)

Browse Source 
HOR-3582

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
jonathan Quispe
2017-07-27 20:03:50 +00:00
committed by Julio Cesar Laura Avendaño
parent 898ae57760 9376388c23
commit c63c2738ce
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/methods/users/users_Ajax.php
View File

@@ -318,8 +318,8 @@ try {
//Get all list of users with the additional information related to department, role, authentication, cases
$oUser = new \ProcessMaker\BusinessModel\User();
$oDatasetUsers = $oUser->getAllUsersWithAuthSource($authSource, $filter, $sort, $start, $limit, $dir);
$rows = $oUser->getAdditionalInfoFromUsers($oDatasetUsers);
echo '{users: ' . G::json_encode($rows['data']) . ', total_users: ' . $rows['totalCount'] . '}';
$rows = $oUser->getAdditionalInfoFromUsers($oDatasetUsers["data"]);
echo '{users: ' . G::json_encode($rows['data']) . ', total_users: ' . $oDatasetUsers["totalRows"] . '}';
break;
case 'updatePageSize':
G::LoadClass('configuration');

3
workflow/engine/src/ProcessMaker/BusinessModel/User.php
View File

@@ -1631,8 +1631,7 @@ class User
$oCriteria->setLimit($limit);
$oDataset = \UsersPeer::DoSelectRs($oCriteria);
$oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
return $oDataset;
return array("data" => $oDataset, "totalRows" => $totalRows);
}
/**
* This function get additional information related to the user