Merge pull request #85 from pief/master

GridFieldOrderableRows: Prefix sort field with table name when sorting
symbiote · Feb 26, 2015 · ad55ced · ad55ced
2 parents 4855ac5 + ea637b0
commit ad55ced
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/code/GridFieldOrderableRows.php b/code/GridFieldOrderableRows.php
@@ -190,7 +190,7 @@ public function getManipulatedData(GridField $grid, SS_List $list) {
 					$sortterm = $this->extraSortFields.', ';
 				}
 			}
-			$sortterm .= $this->getSortField();
+			$sortterm .= $this->getSortTable($list).'.'.$this->getSortField();
 			return $list->sort($sortterm);
 		} else {
 			return $list;
@@ -226,7 +226,7 @@ public function handleReorder($grid, $request) {
 				$sortterm = $this->extraSortFields.', ';
 			}
 		}
-		$sortterm .= $field;
+		$sortterm .= $this->getSortTable($list).'.'.$field;
 		$items = $list->filter('ID', $ids)->sort($sortterm);
 
 		// Ensure that each provided ID corresponded to an actual object.