Event is supposed to come *after* default constraints

auaskwho · Jul 25, 2015 · fc62ca7 · fc62ca7
1 parent 3866ccb
commit fc62ca7
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/modules/backend/behaviors/RelationController.php b/modules/backend/behaviors/RelationController.php
@@ -578,7 +578,6 @@ protected function makeViewWidget()
              */
             $widget = $this->makeWidget('Backend\Widgets\Lists', $config);
             $widget->bindEvent('list.extendQuery', function ($query) {
-                $this->controller->relationExtendQuery($query, $this->field);
                 $this->relationObject->setQuery($query);
 
                 $sessionKey = $this->deferredBinding ? $this->relationGetSessionKey() : null;
@@ -590,6 +589,8 @@ protected function makeViewWidget()
                     $this->relationObject->addConstraints();
                 }
 
+                $this->controller->relationExtendQuery($query, $this->field);
+
                 /*
                  * Allows pivot data to enter the fray
                  */
@@ -722,8 +723,6 @@ protected function makeManageWidget()
          */
         if ($this->manageMode == 'pivot' || $this->manageMode == 'list') {
             $widget->bindEvent('list.extendQuery', function ($query) {
-                $this->controller->relationExtendQuery($query, $this->field);
-
                 /*
                  * Where not in the current list of related records
                  */
@@ -732,6 +731,7 @@ protected function makeManageWidget()
                     $query->whereNotIn($this->relationModel->getQualifiedKeyName(), $existingIds);
                 }
 
+                $this->controller->relationExtendQuery($query, $this->field);
             });
         }