From 1575323037af3c81477f35066a101c118a6b8b91 Mon Sep 17 00:00:00 2001 From: unclecheese Date: Thu, 31 Jan 2013 13:03:33 -0500 Subject: [PATCH] BUGFIX: Use config layer to check for decorated $db fields --- code/forms/GridFieldSortableRows.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/code/forms/GridFieldSortableRows.php b/code/forms/GridFieldSortableRows.php index 401b965..7baa047 100644 --- a/code/forms/GridFieldSortableRows.php +++ b/code/forms/GridFieldSortableRows.php @@ -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; }