diff --git a/workflow/engine/methods/users/users_Ajax.php b/workflow/engine/methods/users/users_Ajax.php index 91aa26f35..aca149802 100644 --- a/workflow/engine/methods/users/users_Ajax.php +++ b/workflow/engine/methods/users/users_Ajax.php @@ -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'); diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/User.php b/workflow/engine/src/ProcessMaker/BusinessModel/User.php index 3e79f9691..3f7775c5e 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/User.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/User.php @@ -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