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

FIX incompatible list detection in framework

Browse Source 
Fixes issue raised in #98 - if using a non-DB List implementation, the
field sort detection fails (ie in array list) so ordering doesn't work.
This commit is contained in:
Marcus Nyeholt 2015-09-03 11:36:48 +10:00
parent 48b0a1f3fc
commit d9182a65d2
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
code/GridFieldOrderableRows.php
View File

@ -190,7 +190,7 @@ class GridFieldOrderableRows extends RequestHandler implements
$sortterm = $this->extraSortFields.', '; $sortterm = $this->extraSortFields.', ';
} }
} }
$sortterm .= '"'.$this->getSortTable($list).'"."'.$this->getSortField().'"'; $sortterm .= $this->sortTerm($list);
return $list->sort($sortterm); return $list->sort($sortterm);
} else { } else {
return $list; return $list;
@ -226,7 +226,7 @@ class GridFieldOrderableRows extends RequestHandler implements
$sortterm = $this->extraSortFields.', '; $sortterm = $this->extraSortFields.', ';
} }
} }
$sortterm .= '"'.$this->getSortTable($list).'"."'.$field.'"'; $sortterm .= $this->sortTerm($list);
$items = $list->filter('ID', $ids)->sort($sortterm); $items = $list->filter('ID', $ids)->sort($sortterm);
// Ensure that each provided ID corresponded to an actual object. // Ensure that each provided ID corresponded to an actual object.
@ -264,6 +264,21 @@ class GridFieldOrderableRows extends RequestHandler implements
return $grid->FieldHolder(); return $grid->FieldHolder();
} }
/**
* Get a compatible sort term, taking into account DBs and their ANSI ness
*
* @see https://github.com/silverstripe-australia/silverstripe-gridfieldextensions/issues/98
*/
protected function sortTerm($list) {
// need to handle ANSI escaping for DBs differently from other list types
if ($list instanceof DataList) {
$sortterm .= '"'.$this->getSortTable($list).'"."'.$this->getSortField().'"';
} else {
$sortterm .= $this->getSortTable($list).'.'.$this->getSortField();
}
}
/** /**
* Handles requests to move an item to the previous or next page. * Handles requests to move an item to the previous or next page.
*/ */