Sort order is now always fixed even if drag and drop toggle is not on

UndefinedOffset · Aug 10, 2012 · 0beef79 · 0beef79
1 parent 2bf027e
commit 0beef79
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/code/forms/GridFieldSortableRows.php b/code/forms/GridFieldSortableRows.php
@@ -89,6 +89,10 @@ public function getHTMLFragments($gridField) {
 	 * @return DataList Modified Data List
 	 */
 	public function getManipulatedData(GridField $gridField, SS_List $dataList) {
+		//Detect and correct items with a sort column value of 0 (push to bottom)
+		$this->fixSortColumn($gridField, $dataList);
+
+
 		$headerState = $gridField->State->GridFieldSortableHeader;
 		$state = $gridField->State->GridFieldSortableRows;
 		if ((!is_bool($state->sortableToggle) || $state->sortableToggle==false) && $headerState && !empty($headerState->SortColumn)) {
@@ -101,10 +105,6 @@ public function getManipulatedData(GridField $gridField, SS_List $dataList) {
 		}
 
 
-		//Detect and correct items with a sort column value of 0 (push to bottom)
-		$this->fixSortColumn($gridField, $dataList);
-
-
 		return $dataList->sort($this->sortColumn);
 	}