On 11/23/2011 07:41 PM, mtaylor(a)redhat.com wrote:
From: Martyn Taylor<mtaylor(a)redhat.com>
---
src/app/controllers/api/images_controller.rb | 5 -----
src/app/views/api/images/_image.xml.haml | 2 +-
2 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/src/app/controllers/api/images_controller.rb
b/src/app/controllers/api/images_controller.rb
index 60f5442..01291e4 100644
--- a/src/app/controllers/api/images_controller.rb
+++ b/src/app/controllers/api/images_controller.rb
@@ -28,11 +28,6 @@ module Api
def index
@images = Aeolus::Image::Warehouse::Image.all
- # TODO This should be in aeolus-image-rubygem
- @builds = {}
- @images.each do |img|
- @builds.merge!({img.id =>
Aeolus::Image::Warehouse::ImageBuild.find_all_by_image_uuid(img.id)})
- end
respond_with(@images)
end
diff --git a/src/app/views/api/images/_image.xml.haml
b/src/app/views/api/images/_image.xml.haml
index 971a7b4..f19b1e6 100644
--- a/src/app/views/api/images/_image.xml.haml
+++ b/src/app/views/api/images/_image.xml.haml
@@ -6,5 +6,5 @@
%os_version= image.os.version
%arch= image.os.arch
%builds{:type => 'xs:list'}
- - @builds[image.id].each do |bld|
+ - image.image_builds.each do |bld|
%build{:id => bld.id, :href => api_build_url(bld.id)}
ACK