From 3dfe104b53c52c6356069d161e869d469156d09b Mon Sep 17 00:00:00 2001 From: ismooth Date: Fri, 3 Oct 2014 16:01:27 +0200 Subject: [PATCH] Initial sorting equals sortColumn After a user has changed sorting order of objects in the list, and when drag&drop is disabled, sorting is made by $default_sort from that DataObjects property or default set by SS. This results in different sorting when checkbox is enabled or disabled what confuses users. This change always sorts the list by $sortColumn, so that user always sees same sorting. --- code/forms/GridFieldSortableRows.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/forms/GridFieldSortableRows.php b/code/forms/GridFieldSortableRows.php index 6f67ea4..3dfc5c9 100644 --- a/code/forms/GridFieldSortableRows.php +++ b/code/forms/GridFieldSortableRows.php @@ -99,7 +99,7 @@ class GridFieldSortableRows implements GridField_HTMLProvider, GridField_ActionP $headerState = $gridField->State->GridFieldSortableHeader; $state = $gridField->State->GridFieldSortableRows; if ((!is_bool($state->sortableToggle) || $state->sortableToggle==false) && $headerState && !empty($headerState->SortColumn)) { - return $dataList; + return $dataList->sort($this->sortColumn); } if ($state->sortableToggle == true) {