[PATCH conductor] Fix 2 example failures in api image#show test
by Jason Guiditta
---
src/spec/controllers/api/images_controller_spec.rb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/spec/controllers/api/images_controller_spec.rb b/src/spec/controllers/api/images_controller_spec.rb
index edd5e98..1c00f05 100644
--- a/src/spec/controllers/api/images_controller_spec.rb
+++ b/src/spec/controllers/api/images_controller_spec.rb
@@ -70,7 +70,7 @@ describe Api::ImagesController do
:name => 'test',
:description => 'test image')
Aeolus::Image::Warehouse::Image.stub(:find).and_return(@image)
- Aeolus::Image::Warehouse::ImageBuild.stub(:find_all_by_image_id).and_return([])
+ Aeolus::Image::Warehouse::ImageBuild.stub(:find_all_by_image_uuid).and_return([])
get :show, :id => '5'
end
--
1.7.6.4
12 years, 6 months
[PATCH conductor] Update for newer warden and rails stack.
by Jason Guiditta
---
src/Gemfile.lock | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/Gemfile.lock b/src/Gemfile.lock
index 51c00f4..133846d 100644
--- a/src/Gemfile.lock
+++ b/src/Gemfile.lock
@@ -1,12 +1,12 @@
GEM
specs:
abstract (1.0.0)
- actionmailer (3.0.9)
- actionpack (= 3.0.9)
+ actionmailer (3.0.10)
+ actionpack (= 3.0.10)
mail (~> 2.3.0)
- actionpack (3.0.9)
- activemodel (= 3.0.9)
- activesupport (= 3.0.9)
+ actionpack (3.0.10)
+ activemodel (= 3.0.10)
+ activesupport (= 3.0.10)
builder (~> 2.1.2)
erubis (~> 2.6.6)
i18n (~> 0.5.0)
@@ -14,19 +14,19 @@ GEM
rack-mount (>= 0.6.14)
rack-test (>= 0.5.4)
tzinfo (~> 0.3.23)
- activemodel (3.0.9)
- activesupport (= 3.0.9)
+ activemodel (3.0.10)
+ activesupport (= 3.0.10)
builder (~> 2.1.2)
i18n (~> 0.5.0)
- activerecord (3.0.9)
- activemodel (= 3.0.9)
- activesupport (= 3.0.9)
+ activerecord (3.0.10)
+ activemodel (= 3.0.10)
+ activesupport (= 3.0.10)
arel (~> 2.0.9)
tzinfo (~> 0.3.23)
- activeresource (3.0.9)
- activemodel (= 3.0.9)
- activesupport (= 3.0.9)
- activesupport (3.0.9)
+ activeresource (3.0.10)
+ activemodel (= 3.0.10)
+ activesupport (= 3.0.10)
+ activesupport (3.0.10)
addressable (2.2.6)
aeolus-image (0.1.0)
imagefactory-console (>= 0.4.0)
@@ -95,19 +95,19 @@ GEM
rack (~> 1.3.0)
rack-test (0.6.0)
rack (>= 1.0)
- rails (3.0.9)
- actionmailer (= 3.0.9)
- actionpack (= 3.0.9)
- activerecord (= 3.0.9)
- activeresource (= 3.0.9)
- activesupport (= 3.0.9)
+ rails (3.0.10)
+ actionmailer (= 3.0.10)
+ actionpack (= 3.0.10)
+ activerecord (= 3.0.10)
+ activeresource (= 3.0.10)
+ activesupport (= 3.0.10)
bundler (~> 1.0)
- railties (= 3.0.9)
- rails_warden (0.5.2)
- warden
- railties (3.0.9)
- actionpack (= 3.0.9)
- activesupport (= 3.0.9)
+ railties (= 3.0.10)
+ rails_warden (0.5.5)
+ warden (>= 1.0.0)
+ railties (3.0.10)
+ actionpack (= 3.0.10)
+ activesupport (= 3.0.10)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.4)
--
1.7.6.4
12 years, 6 months
[PATCH conductor] Initial patch of i18n - rev.2 rebased
by jzigmund@redhat.com
Changes:
- added method set_locale in app_controller(according to Matt's patch ([PATCH] Application controller detects locale from ACCEPT_LANGUAGE header).
- revise all strings in "Monitor section" to be ready to translate
- added cs.yml file for demonstration i18n in "Monitor section" (notice: Czech words in that file aren't real, I generated them via script w/ random strings)
- patch 2/2 revise all flash messages, in en.yml file w/ this structure:
flash:
error:
foo: Foo
notice:
bar: Bar
warning:
12 years, 6 months
[PATCH aeolus-conductor] Added subcollection support in API GETs
by Maros Zatko
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 +++++-
3 files changed, 15 insertions(+), 3 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 3e8712d..a25547e 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..5ca6833 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[:provider_image_id]
+ @images = [Aeolus::Image::Warehouse::ProviderImage.find(params[:provider_image_id]).target_image]
+ else
+ @images = Aeolus::Image::Warehouse::TargetImage.all
+ end
respond_with(@images)
end
--
1.7.6.4
12 years, 6 months
[PATCH conductor] Initial patch of i18n - rev.2
by jzigmund@redhat.com
Changes:
- added method set_locale in app_controller(according to Matt's patch ([PATCH] Application controller detects locale from ACCEPT_LANGUAGE header).
- revise all strings in "Monitor section" to be ready to translate
- added cs.yml file for demonstration i18n in "Monitor section" (notice: Czech words in that file aren't real, I generated them via script w/ random strings)
- patch 2/2 revise all flash messages, in en.yml file w/ this structure:
flash:
error:
foo: Foo
notice:
bar: Bar
warning:
12 years, 6 months