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

FIX Ensuring pagination buttons have a consistent state to work off of (#8957)

Browse Source
This commit is contained in:
Guy Marriott 2019-05-06 14:42:25 +12:00 committed by Aaron Carlino
parent 8ee50d2ba7
commit 856e841955
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Forms/GridField/GridFieldDetailForm_ItemRequest.php
View File

@ -513,9 +513,12 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler
private function getAdjacentRecordID($offset) private function getAdjacentRecordID($offset)
{ {
$gridField = $this->getGridField(); $gridField = $this->getGridField();
$gridStateStr = $this->getRequest()->requestVar('gridState'); $list = $gridField->getManipulatedList();
$state = $gridField->getState(false); $state = $gridField->getState(false);
$gridStateStr = $this->getRequest()->requestVar('gridState');
if (!empty($gridStateStr)) {
$state->setValue($gridStateStr); $state->setValue($gridStateStr);
}
$data = $state->getData(); $data = $state->getData();
$paginator = $data->getData('GridFieldPaginator'); $paginator = $data->getData('GridFieldPaginator');
if (!$paginator) { if (!$paginator) {
@ -528,7 +531,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler
$limit = $itemsPerPage + 2; $limit = $itemsPerPage + 2;
$limitOffset = max(0, $itemsPerPage * ($currentPage-1) -1); $limitOffset = max(0, $itemsPerPage * ($currentPage-1) -1);
$map = $gridField->getManipulatedList()->limit($limit, $limitOffset)->column('ID'); $map = $list->limit($limit, $limitOffset)->column('ID');
$index = array_search($this->record->ID, $map); $index = array_search($this->record->ID, $map);
return isset($map[$index+$offset]) ? $map[$index+$offset] : false; return isset($map[$index+$offset]) ? $map[$index+$offset] : false;
} }