diff --git a/modules/Vtiger/models/FindDuplicate.php b/modules/Vtiger/models/FindDuplicate.php index 4a46af94e09a02044f2b933d8f9e110c3c390b89..1664644efec1a58f37f03267a799e2e36cd00280 100644 --- a/modules/Vtiger/models/FindDuplicate.php +++ b/modules/Vtiger/models/FindDuplicate.php @@ -80,6 +80,7 @@ class Vtiger_FindDuplicate_Model extends Vtiger_Base_Model { $paging->set('nextPageExists', false); } $rows = count($entries); + $paging->recordCount = $rows; for ($i=0; $i<$rows; $i++) { $row = $entries[$i]; diff --git a/modules/Vtiger/views/FindDuplicates.php b/modules/Vtiger/views/FindDuplicates.php index 1f994c947d7761dcd05cb5d1cb1d513be1492790..7d3c6631fa2c6cb575f08c42da09ae235e321b86 100644 --- a/modules/Vtiger/views/FindDuplicates.php +++ b/modules/Vtiger/views/FindDuplicates.php @@ -13,7 +13,7 @@ class Vtiger_FindDuplicates_View extends Vtiger_List_View { function preProcess(Vtiger_Request $request, $display = true) { $viewer = $this->getViewer ($request); $this->initializeListViewContents($request, $viewer); - parent::preProcess($request, $display); + parent::preProcess($request, $display); } public function preProcessTplName(Vtiger_Request $request) { @@ -80,10 +80,13 @@ class Vtiger_FindDuplicates_View extends Vtiger_List_View { if(empty($pageNumber)){ $pageNumber = '1'; } - $pagingModel = new Vtiger_Paging_Model(); - $pagingModel->set('page', $pageNumber); - $pageLimit = $pagingModel->getPageLimit(); - + if (!$this->pagingModel) { + $pagingModel = new Vtiger_Paging_Model(); + $this->pagingModel = $pagingModel; + } else { + $pagingModel = $this->pagingModel; + } + $pagingModel->set('page', $pageNumber); $duplicateSearchFields = $request->get('fields'); $dataModelInstance = Vtiger_FindDuplicate_Model::getInstance($module); $dataModelInstance->set('fields', $duplicateSearchFields); @@ -104,19 +107,9 @@ class Vtiger_FindDuplicates_View extends Vtiger_List_View { $this->rows = $dataModelInstance->getRecordCount(); $viewer->assign('TOTAL_COUNT', $this->rows); } - - $rowCount = 0; - foreach($this->listViewEntries as $group) { - foreach($group as $row) { - $rowCount++; - } - } - //for calculating the page range - for($i=0; $i<$rowCount; $i++) $dummyListEntries[] = $i; - $pagingModel->calculatePageRange($dummyListEntries); - + $viewer->assign('IGNORE_EMPTY', $ignoreEmpty); - $viewer->assign('LISTVIEW_ENTRIES_COUNT', $rowCount); + $viewer->assign('LISTVIEW_ENTRIES_COUNT', $pagingModel->recordCount); $viewer->assign('LISTVIEW_HEADERS', $this->listViewHeaders); $viewer->assign('LISTVIEW_ENTRIES', $this->listViewEntries); $viewer->assign('PAGING_MODEL', $pagingModel); @@ -154,4 +147,4 @@ class Vtiger_FindDuplicates_View extends Vtiger_List_View { $response->setResult($result); $response->emit(); } -} \ No newline at end of file +}