Merge pull request #85 from pief/master

GridFieldOrderableRows: Prefix sort field with table name when sorting
This commit is contained in:
Marcus 2015-02-26 12:51:54 +11:00
commit ad55ceda83

View File

@ -190,7 +190,7 @@ class GridFieldOrderableRows extends RequestHandler implements
$sortterm = $this->extraSortFields.', '; $sortterm = $this->extraSortFields.', ';
} }
} }
$sortterm .= $this->getSortField(); $sortterm .= $this->getSortTable($list).'.'.$this->getSortField();
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 .= $field; $sortterm .= $this->getSortTable($list).'.'.$field;
$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.