TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Narrow the scope of when Lists orderBy conditions are reset. 

Credit to @bennothommo & @daftspunk
Replaces: 9f8d8ec9fa. Refs: #4439
This commit is contained in:
Luke Towers 2019-12-04 02:36:51 -06:00
parent 4ab464cede
commit 5f8a5454ee
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/backend/behaviors/RelationController.php
View File

@ -706,8 +706,11 @@ class RelationController extends ControllerBehavior
});
}
else {
$widget->bindEvent('list.extendQueryBefore', function ($query) {
$widget->bindEvent('list.extendQueryBefore', function ($query) use ($widget) {
$this->relationObject->addDefinedConstraintsToQuery($query);
if ($widget->getSortColumn()) {
$query->getQuery()->orders = [];
}
});
}

1
modules/backend/widgets/Lists.php
View File

@ -532,7 +532,6 @@ class Lists extends WidgetBase
$sortColumn = $column->relation . '_count';
}
$query->getQuery()->orders = [];
$query->orderBy($sortColumn, $this->sortDirection);
}