tonyair
/
sortablegridfield
mirror of https://github.com/UndefinedOffset/SortableGridField.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BUGFIX: Use config layer to check for decorated $db fields

This commit is contained in:
unclecheese 2013-01-31 13:03:33 -05:00
parent 7a9916bcf5
commit 1575323037
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
code/forms/GridFieldSortableRows.php
View File

@ -149,12 +149,14 @@ class GridFieldSortableRows implements GridField_HTMLProvider, GridField_ActionP
$table=false;
$class=$gridField->getModelClass();
if(!empty($class::$db) && array_key_exists($sortColumn, $class::$db)) {
$db = Config::inst()->get($class, "db", CONFIG::UNINHERITED);
if(!empty($db) && array_key_exists($sortColumn, $db)) {
$table=$class;
}else {
$classes=ClassInfo::ancestry($class, true);
foreach($classes as $class) {
if(!empty($class::$db) && array_key_exists($sortColumn, $class::$db)) {
$db = Config::inst()->get($class, "db", CONFIG::UNINHERITED);
if(!empty($db) && array_key_exists($sortColumn, $db)) {
$table=$class;
break;
}
@ -264,14 +266,15 @@ class GridFieldSortableRows implements GridField_HTMLProvider, GridField_ActionP
}else {
//Find table containing the sort column
$table=false;
$class=$gridField->getModelClass();
if(!empty($class::$db) && array_key_exists($sortColumn, $class::$db)) {
$class=$gridField->getModelClass();
$db = Config::inst()->get($class, "db", CONFIG::UNINHERITED);
if(!empty($db) && array_key_exists($sortColumn, $db)) {
$table=$class;
}else {
$classes=ClassInfo::ancestry($class, true);
foreach($classes as $class) {
if(!empty($class::$db) && array_key_exists($sortColumn, $class::$db)) {
$db = Config::inst()->get($class, "db", CONFIG::UNINHERITED);
if(!empty($db) && array_key_exists($sortColumn, $db)) {
$table=$class;
break;
}