Change REST query param "types" back to "type" (should've never chang…

…ed... oops)
gallery · Jun 13, 2013 · 4356331 · 4356331
1 parent 8cfd4d2
commit 4356331
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/modules/gallery/classes/Gallery/Controller/Rest/Item.php b/modules/gallery/classes/Gallery/Controller/Rest/Item.php
@@ -276,8 +276,8 @@ public static function get_members($id, $params) {
       ->limit(Arr::get($params, "num", static::$default_params["num"]))
       ->offset(Arr::get($params, "start", static::$default_params["start"]));
 
-    if (isset($params["types"])) {
-      $members->where("type", "IN", $params["types"]);
+    if (isset($params["type"])) {
+      $members->where("type", "IN", $params["type"]);
     }
 
     if (isset($params["name"])) {

diff --git a/modules/gallery/classes/Gallery/Controller/Rest/Items.php b/modules/gallery/classes/Gallery/Controller/Rest/Items.php
@@ -54,7 +54,7 @@ class Gallery_Controller_Rest_Items extends Controller_Rest {
    * @see  Controller_Rest_Item::get_members().
    */
   public static function get_members($id, $params) {
-    $types = Arr::get($params, "types");
+    $types = Arr::get($params, "type");
     $name = Arr::get($params, "name");
 
     $data = array();

diff --git a/modules/gallery/classes/Gallery/Controller/Rest/Tree.php b/modules/gallery/classes/Gallery/Controller/Rest/Tree.php
@@ -60,8 +60,8 @@ static function get_entity($id, $params) {
       $members->where("level", "<=", $item->level + $params["depth"]);
     }
 
-    if (isset($params["types"])) {
-      $members->where("type", "IN", $params["types"]);
+    if (isset($params["type"])) {
+      $members->where("type", "IN", $params["type"]);
     }
 
     $members = $members->viewable()->find_all();
@@ -109,8 +109,8 @@ static function get_members($id, $params) {
       return array();
     }
 
-    if (isset($params["types"])) {
-      $members->where("type", "IN", $params["types"]);
+    if (isset($params["type"])) {
+      $members->where("type", "IN", $params["type"]);
     }
 
     $members = $members->viewable()->find_all();

diff --git a/modules/rest/classes/Rest/Controller/Rest.php b/modules/rest/classes/Rest/Controller/Rest.php
@@ -111,14 +111,14 @@ public function before() {
     // Process some additional fields, depending on the method.
     switch ($method) {
     case HTTP_Request::GET:
-      // Process the "types" list, if specified.
-      if ($types = $this->request->query("types")) {
+      // Process the "type" list, if specified.
+      if ($types = $this->request->query("type")) {
         $types = explode(",", trim($types, ","));
         // If one or more of the types is invalid, fire a 400 Bad Request.
         if (array_diff($types, array("album", "photo", "movie"))) {
-          throw Rest_Exception::factory(400, array("types" => "invalid"));
+          throw Rest_Exception::factory(400, array("type" => "invalid"));
         }
-        $this->request->query("types", $types);
+        $this->request->query("type", $types);
       }
       break;
 

diff --git a/modules/search/classes/Search/Controller/Rest/Search.php b/modules/search/classes/Search/Controller/Rest/Search.php
@@ -66,7 +66,7 @@ static function get_members($id, $params) {
 
     // Build the members array.
     $data = array();
-    $types = Arr::get($params, "types");
+    $types = Arr::get($params, "type");
     foreach ($result[1] as $item) {
       if (!$types || in_array($item->type, $types)) {
         $data[] = array("item", $item->id);

diff --git a/modules/tag/classes/Tag/Controller/Rest/TagItems.php b/modules/tag/classes/Tag/Controller/Rest/TagItems.php
@@ -65,8 +65,8 @@ static function get_members($id, $params) {
       ->limit(Arr::get($params, "num", static::$default_params["num"]))
       ->offset(Arr::get($params, "start", static::$default_params["start"]));
 
-    if (isset($params["types"])) {
-      $members->where("type", "IN", $params["types"]);
+    if (isset($params["type"])) {
+      $members->where("type", "IN", $params["type"]);
     }
 
     if (isset($params["name"])) {