[Bug][BC] Filters should be merged with user's ones instead of overri…

…ding
tunecino · May 31, 2019 · d0f669c · d0f669c
1 parent b35827d
commit d0f669c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/Action.php b/src/Action.php
@@ -107,7 +107,7 @@ public function findCurrentModels($IDs)
         $getter = 'get' . $this->relationName;
 
         $relModel = $this->getRelativeModel();
-        $q = $relModel->$getter()->where([$pk => $ids]);
+        $q = $relModel->$getter()->andWhere([$pk => $ids]);
 
         $ci = count($ids);
         $model = $ci > 1 ? $q->all() : $q->one();

diff --git a/src/LinkAction.php b/src/LinkAction.php
@@ -52,10 +52,10 @@ public function run($IDs)
 
         $to_link = [];
         foreach ($ids as $pk_value) {
-            $linked = $relModel->$getter()->where([$pk => $pk_value])->exists();
+            $linked = $relModel->$getter()->andWhere([$pk => $pk_value])->exists();
 
             if ($linked === false) {
-                $exist = $modelClass::find()->where([$pk => $pk_value])->exists();
+                $exist = $modelClass::find()->andWhere([$pk => $pk_value])->exists();
 
                 if ($exist === false)
                     throw new NotFoundHttpException(StringHelper::basename($modelClass) . " '$pk_value' not found.");

diff --git a/src/UnlinkAction.php b/src/UnlinkAction.php
@@ -39,7 +39,7 @@ public function run($IDs)
 
         $to_unlink = [];
         foreach ($ids as $pk_value) {
-            $linked = $relModel->$getter()->where([$pk => $pk_value])->exists();
+            $linked = $relModel->$getter()->andWhere([$pk => $pk_value])->exists();
             if ($linked === true) $to_unlink []= $this->findModel($pk_value);
             else throw new BadRequestHttpException(StringHelper::basename($modelClass) . " '$pk_value' not linked to ".StringHelper::basename($this->relativeClass)." '$this->relative_id'.");
         }