From: Maros Zatko <mzatko(a)redhat.com>
---
src/app/controllers/api/builds_controller.rb | 6 +++++-
.../controllers/api/provider_images_controller.rb | 6 +++++-
.../controllers/api/target_images_controller.rb | 6 +++++-
src/config/routes.rb | 6 ++++--
4 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/app/controllers/api/builds_controller.rb
b/src/app/controllers/api/builds_controller.rb
index e916450..c4636cb 100644
--- a/src/app/controllers/api/builds_controller.rb
+++ b/src/app/controllers/api/builds_controller.rb
@@ -27,7 +27,11 @@ module Api
layout :false
def index
- @builds = Aeolus::Image::Warehouse::ImageBuild.all
+ if params[:image_id]
+ @builds =
Aeolus::Image::Warehouse::ImageBuild.find_all_by_image_uuid(params[:image_id])
+ else
+ @builds = Aeolus::Image::Warehouse::ImageBuild.all
+ end
respond_with(@builds)
end
diff --git a/src/app/controllers/api/provider_images_controller.rb
b/src/app/controllers/api/provider_images_controller.rb
index 16e3e1a..7588f07 100644
--- a/src/app/controllers/api/provider_images_controller.rb
+++ b/src/app/controllers/api/provider_images_controller.rb
@@ -27,7 +27,11 @@ module Api
layout :false
def index
- @images = Aeolus::Image::Warehouse::ProviderImage.all
+ if params[:target_image_id]
+ @images =
Aeolus::Image::Warehouse::TargetImage.find(params[:target_image_id]).provider_images
+ else
+ @images = Aeolus::Image::Warehouse::ProviderImage.all
+ end
respond_with(@images)
end
diff --git a/src/app/controllers/api/target_images_controller.rb
b/src/app/controllers/api/target_images_controller.rb
index 0a4945a..47cdf18 100644
--- a/src/app/controllers/api/target_images_controller.rb
+++ b/src/app/controllers/api/target_images_controller.rb
@@ -27,7 +27,11 @@ module Api
layout :false
def index
- @images = Aeolus::Image::Warehouse::TargetImage.all
+ if params[:build_id]
+ @images =
Aeolus::Image::Warehouse::ProviderImage.find(params[:build_id]).target_images
+ else
+ @images = Aeolus::Image::Warehouse::TargetImage.all
+ end
respond_with(@images)
end
diff --git a/src/config/routes.rb b/src/config/routes.rb
index 138dd5a..7582539 100644
--- a/src/config/routes.rb
+++ b/src/config/routes.rb
@@ -195,10 +195,12 @@ Conductor::Application.routes.draw do
resources :images do
resources :builds
end
- resources :builds
- resources :provider_images do
+ resources :builds do
resources :target_images
end
+
+ resources :provider_images
+
resources :target_images do
resources :provider_images
end
--
1.7.6.2