[PATCH conductor] BZ799492: Fix "push is about to start" message
Jozef Zigmund
jzigmund at redhat.com
Tue Mar 6 15:22:25 UTC 2012
On Tuesday 06 March 2012 11:26:43 ifarkas at redhat.com wrote:
> From: Imre Farkas <ifarkas at redhat.com>
>
> https://bugzilla.redhat.com/show_bug.cgi?id=799492
> ---
> src/app/controllers/images_controller.rb | 2 +-
> src/app/controllers/provider_images_controller.rb | 2 +-
> src/app/views/images/show.html.haml | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/src/app/controllers/images_controller.rb
> b/src/app/controllers/images_controller.rb index 7d71b73..a085e7b 100644
> --- a/src/app/controllers/images_controller.rb
> +++ b/src/app/controllers/images_controller.rb
> @@ -38,7 +38,7 @@ class ImagesController < ApplicationController
> @image = Aeolus::Image::Warehouse::Image.find(params[:id])
> @environment = PoolFamily.where('name' => @image.environment).first
> @push_started = params[:push_started] == 'true'
> - @pushed_target_image_id = params[:pushed_target_image_id]
> + @pushed_provider_account =
> ProviderAccount.find(params[:provider_account_id]) if
> params[:provider_account_id].present?
>
> if @image.imported?
> begin
> diff --git a/src/app/controllers/provider_images_controller.rb
> b/src/app/controllers/provider_images_controller.rb index 60fabe5..0f94e38
> 100644
> --- a/src/app/controllers/provider_images_controller.rb
> +++ b/src/app/controllers/provider_images_controller.rb
> @@ -38,7 +38,7 @@ class ProviderImagesController < ApplicationController
> flash[:warning] = t('provider_images.flash.warning.upload_failed')
> end
> redirect_to image_path(params[:image_id], :build => params[:build_id],
> :push_started => @push_started, -
> :pushed_target_image_id => @push_started ? @provider_image.target_image_id
> : nil) + :provider_account_id => @push_started ?
> provider_account.id : nil) end
>
> def destroy
> diff --git a/src/app/views/images/show.html.haml
> b/src/app/views/images/show.html.haml index 38e34cf..bbee92f 100644
> --- a/src/app/views/images/show.html.haml
> +++ b/src/app/views/images/show.html.haml
> @@ -108,7 +108,7 @@
> - if timg and b =
> @builder.find_active_push(timg.id, account.provider.name,
> account.credentials_hash['username']) = label_tag b.status
> - elsif timg and not pimg and @build and
> @build.id == @latest_build - - if
> @push_started && @pushed_target_image_id == timg.id +
> - if @push_started && @pushed_provider_account == account .light
> = t('images.show.push_started')
> - else\
ACK. works fine.
More information about the aeolus-devel
mailing list