tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-01 05:39:10 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX GridFieldPaginator did not work correctly after SS_Limitable was introduced

Browse Source
This commit is contained in:
Stig Lindqvist 2012-03-09 17:06:21 +13:00
parent 4f1da0a5e8
commit 6d380cd546
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
forms/gridfield/GridFieldPaginator.php
View File

@ -89,6 +89,8 @@ class GridFieldPaginator implements GridField_HTMLProvider, GridField_DataManipu
$state = $gridField->State->GridFieldPaginator;
$state->currentPage = (int)$arguments;
}
protected $totalItems = 0;
/**
*
@ -99,9 +101,12 @@ class GridFieldPaginator implements GridField_HTMLProvider, GridField_DataManipu
public function getManipulatedData(GridField $gridField, SS_List $dataList) {
if(!$this->checkDataType($dataList)) return $dataList;
$this->totalItems = $gridField->getList()->count();
$state = $gridField->State->GridFieldPaginator;
if(!is_int($state->currentPage))
if(!is_int($state->currentPage)) {
$state->currentPage = 1;
}
if(!($dataList instanceof SS_Limitable)) {
return $dataList;
@ -126,8 +131,7 @@ class GridFieldPaginator implements GridField_HTMLProvider, GridField_DataManipu
$state->currentPage = 1;
// Figure out which page and record range we're on
$countList = clone $gridField->List;
$totalRows = $countList->limit(null)->count();
$totalRows = $this->totalItems;
if(!$totalRows) return array();
$totalPages = ceil($totalRows/$this->itemsPerPage);