From e9d712c52830725b24f20da7ff8662e97d22014d Mon Sep 17 00:00:00 2001
From: Alex Meade <alex.meade@rackspace.com>
Date: Thu, 7 Jul 2011 14:51:12 -0400
Subject: Removed bookmark link from non detailed image viewbuilder

---
 nova/api/openstack/views/images.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/views/images.py b/nova/api/openstack/views/images.py
index 005341c62..fc4c1b55e 100644
--- a/nova/api/openstack/views/images.py
+++ b/nova/api/openstack/views/images.py
@@ -108,18 +108,17 @@ class ViewBuilderV11(ViewBuilder):
         href = self.generate_href(image_obj["id"])
         bookmark = self.generate_bookmark(image_obj["id"])
 
-        if detail:
-            image["metadata"] = image_obj.get("properties", {})
-
         image["links"] = [{
             "rel": "self",
             "href": href,
-        },
-        {
-            "rel": "bookmark",
-            "href": bookmark,
         }]
 
+        if detail:
+            image["metadata"] = image_obj.get("properties", {})
+            image["links"].append({"rel": "bookmark",
+                                   "href": bookmark,
+            })
+
         return image
 
     def generate_bookmark(self, image_id):
-- 
cgit