diff --git a/module/execution/control.php b/module/execution/control.php index 59ad6d8839..1ccc85d81e 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -2384,7 +2384,7 @@ class execution extends control $this->view->object = $object; $this->view->products = $products; - $this->view->allStories = empty($allStories) ? $allStories : $allStories[$pageID - 1];; + $this->view->allStories = empty($allStories) ? $allStories : $allStories[$pageID - 1]; $this->view->pager = $pager; $this->view->browseType = $browseType; $this->view->productType = $productType; diff --git a/module/personnel/control.php b/module/personnel/control.php index 8f373cf5ef..fa8cc3b6a4 100644 --- a/module/personnel/control.php +++ b/module/personnel/control.php @@ -31,13 +31,17 @@ class personnel extends control $program = $this->program->getByID($programID); - /* Set the pager. */ - $this->app->loadClass('pager', true); - $pager = pager::init($recTotal, $recPerPage, $pageID); - /* Build the search form. */ $queryID = $browseType == 'bysearch' ? (int)$param : 0; $actionURL = $this->createLink('personnel', 'accessible', "pargramID=$programID&deptID=$deptID&browseType=bysearch&quertID=myQueryID"); + $personnelList = $this->personnel->getAccessiblePersonnel($programID, $deptID, $browseType, $queryID); + + /* Set the pager. */ + $this->app->loadClass('pager', true); + $recTotal = count($personnelList); + $pager = new pager($recTotal, $recPerPage, $pageID); + $personnelList = array_chunk($personnelList, $pager->recPerPage); + $this->config->personnel->accessible->search['params']['role']['values'] = $this->lang->user->roleList; $this->config->personnel->accessible->search['params']['gender']['values'] = $this->lang->user->genderList; $this->personnel->buildSearchForm($queryID, $actionURL); @@ -54,7 +58,7 @@ class personnel extends control $this->view->pager = $pager; $this->view->param = $param; $this->view->browseType = $browseType; - $this->view->personnelList = $this->personnel->getAccessiblePersonnel($programID, $deptID, $browseType, $queryID, $pager); + $this->view->personnelList = empty($personnelList) ? $personnelList : $personnelList[$pageID - 1]; $this->view->deptList = $this->loadModel('dept')->getOptionMenu(); $this->view->dept = $this->dept->getByID($deptID); $this->view->deptTree = $this->dept->getTreeMenu($deptID = 0, array(new personnelModel, 'createMemberLink'), $programID); diff --git a/module/personnel/model.php b/module/personnel/model.php index ebaed2944f..6ecd627650 100644 --- a/module/personnel/model.php +++ b/module/personnel/model.php @@ -19,11 +19,10 @@ class personnelModel extends model * @param string $browseType * @param string $orderBy * @param int $queryID - * @param object $pager * @access public * @return array */ - public function getAccessiblePersonnel($programID = 0, $deptID = 0, $browseType = 'all', $queryID = 0, $pager) + public function getAccessiblePersonnel($programID = 0, $deptID = 0, $browseType = 'all', $queryID = 0) { $accessibleQuery = ''; if($browseType == 'bysearch') @@ -47,7 +46,6 @@ class personnelModel extends model ->beginIF($program->acl != 'open')->andWhere("CONCAT(',', t1.programs, ',')")->like("%,$programID,%") ->beginIF($deptID > 0)->andWhere('t2.dept')->eq($deptID)->fi() ->beginIF($browseType == 'bysearch')->andWhere($accessibleQuery)->fi() - ->page($pager) ->fetchAll('id'); if($program->acl == 'open')