From 5f8a5454eeb401d5ac13b5b644353b8dcaf0de14 Mon Sep 17 00:00:00 2001
From: Luke Towers <luke@luketowers.ca>
Date: Wed, 4 Dec 2019 02:36:51 -0600
Subject: [PATCH] Narrow the scope of when Lists orderBy conditions are reset.

Credit to @bennothommo & @daftspunk
Replaces: https://github.com/octobercms/october/commit/9f8d8ec9fabad06e0eb4b222611910e608729074. Refs: #4439
---
 modules/backend/behaviors/RelationController.php | 5 ++++-
 modules/backend/widgets/Lists.php                | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/backend/behaviors/RelationController.php b/modules/backend/behaviors/RelationController.php
index 542e4c7cf..2306b5ffb 100644
--- a/modules/backend/behaviors/RelationController.php
+++ b/modules/backend/behaviors/RelationController.php
@@ -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 = [];
+                    }
                 });
             }
 
diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
index 59fc31194..cd2b96723 100644
--- a/modules/backend/widgets/Lists.php
+++ b/modules/backend/widgets/Lists.php
@@ -532,7 +532,6 @@ class Lists extends WidgetBase
                 $sortColumn = $column->relation . '_count';
             }
 
-            $query->getQuery()->orders = [];
             $query->orderBy($sortColumn, $this->sortDirection);
         }