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

Merge pull request #5394 from kinglozzer/3192-gf-pagination

Browse Source 
FIX: GridFieldPaginator now prevents viewing pages with no results (fixes #3192)
This commit is contained in:
Daniel Hensby 2016-04-26 12:44:11 +01:00
commit b9e5a198e8
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
forms/gridfield/GridFieldPaginator.php
View File

@ -131,7 +131,6 @@ class GridFieldPaginator implements GridField_HTMLProvider, GridField_DataManipu
* @return SS_List * @return SS_List
*/ */
public function getManipulatedData(GridField $gridField, SS_List $dataList) { public function getManipulatedData(GridField $gridField, SS_List $dataList) {
if(!$this->checkDataType($dataList)) return $dataList; if(!$this->checkDataType($dataList)) return $dataList;
$state = $this->getGridPagerState($gridField); $state = $this->getGridPagerState($gridField);
@ -139,11 +138,18 @@ class GridFieldPaginator implements GridField_HTMLProvider, GridField_DataManipu
// Update item count prior to filter. GridFieldPageCount will rely on this value // Update item count prior to filter. GridFieldPageCount will rely on this value
$this->totalItems = $dataList->count(); $this->totalItems = $dataList->count();
$startRow = $this->itemsPerPage * ($state->currentPage - 1);
// Prevent visiting a page with an offset higher than the total number of items
if($startRow >= $this->totalItems) {
$state->currentPage = 1;
$startRow = 0;
}
if(!($dataList instanceof SS_Limitable) || ($dataList instanceof UnsavedRelationList)) { if(!($dataList instanceof SS_Limitable) || ($dataList instanceof UnsavedRelationList)) {
return $dataList; return $dataList;
} }
$startRow = $this->itemsPerPage * ($state->currentPage - 1);
return $dataList->limit((int)$this->itemsPerPage, (int)$startRow); return $dataList->limit((int)$this->itemsPerPage, (int)$startRow);
} }

18
tests/forms/gridfield/GridFieldPaginatorTest.php
View File

@ -51,4 +51,22 @@ class GridFieldPaginatorTest extends FunctionalTest {
// Check that there is still 'View 1 - 4 of 4' part on the left of the paginator // Check that there is still 'View 1 - 4 of 4' part on the left of the paginator
$this->assertEquals(2, count($content->getBySelector('.pagination-records-number'))); $this->assertEquals(2, count($content->getBySelector('.pagination-records-number')));
} }
public function testPaginationAvoidsIllegalOffsets() {
$grid = $this->gridField;
$total = $this->list->count();
$perPage = $grid->getConfig()->getComponentByType('GridFieldPaginator')->getItemsPerPage();
// Get the last page that will contain results
$lastPage = ceil($total / $perPage);
// Set the paginator state to point to an 'invalid' page
$grid->State->GridFieldPaginator->currentPage = $lastPage + 1;
// Get the paginated list
$list = $grid->getManipulatedList();
// Assert that the paginator state has been corrected and the list contains items
$this->assertEquals(1, $grid->State->GridFieldPaginator->currentPage);
$this->assertEquals($perPage, $list->count());
}
} }