Skip to content
Snippets Groups Projects
Commit 23df71d6 authored by Uma's avatar Uma
Browse files

Fixes #1216 Find duplicate pagination is addressed

parent 09f8c6f4
No related branches found
No related tags found
1 merge request!507Fixes #1216 Find duplicate pagination is addressed
......@@ -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];
......
......@@ -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
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment