[PATCH conductor] Fix images#show when there's no existing build
Jozef Zigmund
jzigmund at redhat.com
Tue May 29 14:34:20 UTC 2012
On Tuesday 29 May 2012 14:25:33 ifarkas at redhat.com wrote:
> From: Imre Farkas <ifarkas at redhat.com>
>
> ---
> src/app/controllers/images_controller.rb | 13 ++++++++++---
> 1 files changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/src/app/controllers/images_controller.rb
> b/src/app/controllers/images_controller.rb index 8566191..a114f9d 100644
> --- a/src/app/controllers/images_controller.rb
> +++ b/src/app/controllers/images_controller.rb
> @@ -380,7 +380,12 @@ class ImagesController < ApplicationController
> end
>
> active_build =
> - @builder.find_active_build(@build.id,
> provider_type.deltacloud_driver) + if @build
> + @builder.find_active_build(@build.id,
> provider_type.deltacloud_driver) + else
> + @builder.find_active_build_by_imageid(@image.id,
> provider_type.deltacloud_driver) + end
> +
> build_status = { :is_active_build => active_build.present?,
>
> :build_action_available => !target_image.present? &&
>
> (@is_latest_build ||
> !@build), @@ -405,9 +410,11 @@ class ImagesController <
> ApplicationController
> :target =>
> :provider_type.deltacloud_driver,
> :build_id => @build ? @build.id : nil)
>
> failed_build_count =
> - @builder.failed_build_count(@build.id,
> provider_type.deltacloud_driver) + if @build
> + @builder.failed_build_count(@build.id,
> provider_type.deltacloud_driver) + end
>
> - if failed_build_count > 0
> + if failed_build_count.present? && failed_build_count > 0
> build_status[:translated_failed_build_count] =
> t('images.show.failed_build_attempts', :count =>
> failed_build_count) end
ACK
More information about the aeolus-devel
mailing list