updated query options, action index

query default controller api action index by domain_id OR access_domain, was only possible in combination
dmstr · Apr 19, 2016 · 2e8c9ce · 2e8c9ce
1 parent 7e431b3
commit 2e8c9ce
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/controllers/api/DefaultController.php b/controllers/api/DefaultController.php
@@ -45,13 +45,11 @@ public function actions()
                     if (isset($_GET[$modelClass::ATTR_ID])) {
                         $query->andFilterWhere([$modelClass::ATTR_ID => $_GET[$modelClass::ATTR_ID]]);
                     }
-                    if (isset($_GET[$modelClass::ATTR_DOMAIN_ID]) && isset($_GET[$modelClass::ATTR_ACCESS_DOMAIN])) {
-                        $query->andFilterWhere(
-                            [$modelClass::ATTR_DOMAIN_ID => $_GET[$modelClass::ATTR_DOMAIN_ID]]
-                        );
-                        $query->andFilterWhere(
-                            [$modelClass::ATTR_ACCESS_DOMAIN => $_GET[$modelClass::ATTR_ACCESS_DOMAIN]]
-                        );
+                    if (isset($_GET[$modelClass::ATTR_DOMAIN_ID])) {
+                        $query->andFilterWhere([$modelClass::ATTR_DOMAIN_ID => $_GET[$modelClass::ATTR_DOMAIN_ID]]);
+                    }
+                    if (isset($_GET[$modelClass::ATTR_ACCESS_DOMAIN])) {
+                        $query->andFilterWhere([$modelClass::ATTR_ACCESS_DOMAIN => $_GET[$modelClass::ATTR_ACCESS_DOMAIN]]);
                     }
                     if (isset($_GET[$modelClass::ATTR_ROOT])) {
                         $query->andFilterWhere([$modelClass::ATTR_ROOT => $_GET[$modelClass::ATTR_ROOT]]);
@@ -69,4 +67,4 @@ public function actions()
             ]
         ];
     }
-}
+}