[PATCH conductor] BZ#790250 Check Build Status on Show Image - jQuery template

Tomáš Hrčka thrcka at redhat.com
Fri Mar 2 12:24:26 UTC 2012


On 02/29/2012 04:54 PM, ifarkas at redhat.com wrote:
> From: Imre Farkas<ifarkas at redhat.com>
>
> ---
>   src/app/controllers/images_controller.rb |    9 +++++++++
>   src/app/views/images/show.html.haml      |    2 ++
>   2 files changed, 11 insertions(+), 0 deletions(-)
>
> diff --git a/src/app/controllers/images_controller.rb b/src/app/controllers/images_controller.rb
> index dcca913..26f12df 100644
> --- a/src/app/controllers/images_controller.rb
> +++ b/src/app/controllers/images_controller.rb
> @@ -75,6 +75,14 @@ class ImagesController<  ApplicationController
>             result
>           end
>
> +        active_builds_by_image_id = @account_groups.keys.inject(Hash.new({}))  do |result, driver|
> +          result[@image.id] = {} unless result.has_key?(@image.id)
> +          result[@image.id][driver] = @builder.find_active_build_by_imageid(@image.id, driver)
> +          result[@image.id][driver].attributes['status'].capitalize! if result[@image.id][driver]
> +
> +          result
> +        end
> +
>           active_pushes = @account_groups.inject({})  do |result, (driver, group)|
>             timg = @target_images_by_target[driver]
>             group[:accounts].each do |account|
> @@ -114,6 +122,7 @@ class ImagesController<  ApplicationController
>                             :provider_images =>  provider_images,
>                             :target_images_by_target =>  @target_images_by_target,
>                             :active_builds =>  active_builds,
> +                          :active_builds_by_image_id =>  active_builds_by_image_id,
>                             :active_pushes =>  active_pushes,
>                             :failed_build_counts =>  failed_build_counts,
>                             :failed_push_counts =>  failed_push_counts,
> diff --git a/src/app/views/images/show.html.haml b/src/app/views/images/show.html.haml
> index 1d31d36..e784707 100644
> --- a/src/app/views/images/show.html.haml
> +++ b/src/app/views/images/show.html.haml
> @@ -134,6 +134,8 @@
>                   <h3>${group['type']['name']}</h3>
>                   {{if build&&  active_builds[driver]}}
>                     <label>${active_builds[driver]['builder']['status']}</label>
> +                {{else !build&&  active_builds_by_image_id[image['uuid']][driver]}}
> +<label>${active_builds_by_image_id[image['uuid']][driver]['builder']['status']}</label>
>                   {{else target_images_by_target[driver]}}
>                     #{path = image_target_image_path('replace_image_id', 'replace_target_image_id')
>                       path = path.sub('replace_image_id', '${image[\'uuid\']}')
ACK



More information about the aeolus-devel mailing list