Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 (cms interface) applies default sort order to CMS ordering #325

Merged
merged 4 commits into from
Feb 2, 2022
Merged

🐛 (cms interface) applies default sort order to CMS ordering #325

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33f3dde
🐛 (cms interface) applies default sort order to CMS ordering
davejtoews Aug 24, 2021
bb0876a
Merge branch 'symbiote:3' into secondary-sort-fix
davejtoews Nov 25, 2021
65cbe10
🐛 (sort logic) adds additional checks for non DataList or unsorted cases
davejtoews Nov 25, 2021
1436ead
Update src/GridFieldOrderableRows.php
davejtoews Nov 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/GridFieldOrderableRows.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
use SilverStripe\Control\HTTPResponse_Exception;
use SilverStripe\Control\RequestHandler;
use SilverStripe\Core\ClassInfo;
use SilverStripe\Core\Config\Config;
use SilverStripe\Forms\GridField\GridField;
use SilverStripe\Forms\GridField\GridField_ColumnProvider;
use SilverStripe\Forms\GridField\GridField_DataManipulator;
Expand Down Expand Up @@ -360,7 +361,17 @@ public function getManipulatedData(GridField $grid, SS_List $list)
$sortterm .= $this->getSortTable($list).'.'.$this->getSortField();
} else {
$sortterm .= '"'.$this->getSortTable($list).'"."'.$this->getSortField().'"';

if ($list instanceof DataList) {
$classname = $list->dataClass();
if ($defaultSort = Config::inst()->get($classname, 'default_sort')) {
// Append the default sort to the end of the sort string
// This may result in redundancy... but it seems to work
$sortterm .= ($sortterm ? ', ' : '') . $defaultSort;
}
}
}

return $list->sort($sortterm);
}

Expand Down