Merge branch 'spekulatius-fixing-must-be-an-Int-column-is-of-type-int'
This commit is contained in:
commit
e1b94a3bf3
|
@ -163,7 +163,7 @@ class GridFieldSortableRows implements GridField_HTMLProvider, GridField_ActionP
|
||||||
if (!$many_many) {
|
if (!$many_many) {
|
||||||
$sng=singleton($gridField->getModelClass());
|
$sng=singleton($gridField->getModelClass());
|
||||||
$fieldType=$sng->db($this->sortColumn);
|
$fieldType=$sng->db($this->sortColumn);
|
||||||
if(!$fieldType || !($fieldType=='Int' || is_subclass_of('Int', $fieldType))) {
|
if(!$fieldType || !(strtolower($fieldType) == 'int' || is_subclass_of('Int', $fieldType))) {
|
||||||
if(is_array($fieldType)) {
|
if(is_array($fieldType)) {
|
||||||
user_error('Sort column '.$this->sortColumn.' could not be found in '.$gridField->getModelClass().'\'s ancestry', E_USER_ERROR);
|
user_error('Sort column '.$this->sortColumn.' could not be found in '.$gridField->getModelClass().'\'s ancestry', E_USER_ERROR);
|
||||||
}else {
|
}else {
|
||||||
|
@ -571,4 +571,4 @@ class GridFieldSortableRows implements GridField_HTMLProvider, GridField_ActionP
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
?>
|
?>
|
Loading…
Reference in New Issue