From 369417c3ad090739a69270b2c50fd1a0889acb6e Mon Sep 17 00:00:00 2001
From: jakedt <jacob.moshenko@gmail.com>
Date: Mon, 17 Feb 2014 14:52:46 -0500
Subject: [PATCH] Fix the test for where extended image properties should come
 from. Fix the delete tag dialog to specify that the repo will be gc'ed after
 tag deletion.

---
 endpoints/api.py               | 5 ++++-
 static/partials/view-repo.html | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/endpoints/api.py b/endpoints/api.py
index 4d79c26ca..d3a625e59 100644
--- a/endpoints/api.py
+++ b/endpoints/api.py
@@ -1084,7 +1084,10 @@ def delete_repository(namespace, repository):
 
 
 def image_view(image):
-  extended_props = image.storage or image
+  extended_props = image
+  if image.storage and image.storage.id:
+    extended_props = image.storage
+
   command = extended_props.command
   return {
     'id': image.docker_image_id,
diff --git a/static/partials/view-repo.html b/static/partials/view-repo.html
index c46eaf16e..9fdb632b7 100644
--- a/static/partials/view-repo.html
+++ b/static/partials/view-repo.html
@@ -254,7 +254,7 @@ sudo docker push quay.io/{{repo.namespace}}/{{repo.name}}</pre>
         </span>?
 
         <div ng-show="tagSpecificImages(tagToDelete).length" style="margin-top: 20px">
-          The following images will also be deleted:
+          The following images and any other images not referenced by a tag will be deleted:
           <div class="image-listings">
             <div class="image-listing" ng-repeat="image in tagSpecificImages(tagToDelete) | limitTo:5"
                  ng-class="getImageListingClasses(image, tagToDelete)">