From 6425d41eddd44091b2d83ba3c3734cc6990ca581 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 7 Jun 2010 23:12:52 -0700
Subject: Add a "preserve_ids" global query parameter for REST requests that
 indicates that we shouldn't opportunistically convert ids into REST urls.

---
 modules/gallery/helpers/items_rest.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'modules/gallery/helpers/items_rest.php')

diff --git a/modules/gallery/helpers/items_rest.php b/modules/gallery/helpers/items_rest.php
index 9cca9a54..e9773745 100644
--- a/modules/gallery/helpers/items_rest.php
+++ b/modules/gallery/helpers/items_rest.php
@@ -36,6 +36,8 @@ class items_rest_Core {
    */
   static function get($request) {
     $items = array();
+    $preserve_ids = isset($request->params->preserve_ids) ?
+      (bool)$request->params->preserve_ids : false;
     if (isset($request->params->urls)) {
       foreach (json_decode($request->params->urls) as $url) {
         if (isset($request->params->type)) {
@@ -45,10 +47,10 @@ class items_rest_Core {
         if (access::can("view", $item)) {
           if (isset($types)) {
             if (in_array($item->type, $types)) {
-              $items[] = items_rest::_format_restful_item($item);
+              $items[] = items_rest::_format_restful_item($item, $preserve_ids);
             }
           } else {
-            $items[] = items_rest::_format_restful_item($item);
+            $items[] = items_rest::_format_restful_item($item, $preserve_ids);
           }
         }
       }
@@ -57,9 +59,9 @@ class items_rest_Core {
       if (!access::can("view", $item)) {
         throw new Kohana_404_Exception();
       }
-      $items[] = items_rest::_format_restful_item($item);
+      $items[] = items_rest::_format_restful_item($item, $preserve_ids);
       while (($item = $item->parent()) != null) {
-        array_unshift($items, items_rest::_format_restful_item($item));
+        array_unshift($items, items_rest::_format_restful_item($item, $preserve_ids));
       };
     }
 
@@ -74,9 +76,9 @@ class items_rest_Core {
     return $item;
   }
 
-  private static function _format_restful_item($item) {
+  private static function _format_restful_item($item, $preserve_ids) {
     $item_rest = array("url" => rest::url("item", $item),
-                       "entity" => $item->as_restful_array(),
+                       "entity" => $item->as_restful_array($preserve_ids),
                        "relationships" => rest::relationships("item", $item));
     if ($item->type == "album") {
       $members = array();
-- 
cgit v1.2.3