[PATCH conductor] Fix the Launch button on Deployable Details page

Jozef Zigmund jzigmund at redhat.com
Thu Feb 2 22:22:53 UTC 2012


On Wednesday 01 February 2012 13:41:17 tsedovic at redhat.com wrote:
> From: Tomas Sedovic <tomas at sedovic.cz>
> 
> Since the Launch Deployment Overview page allows the user to change the name
> and select the realms, the Launch button on the Deployable Details should
> go directly to that screen.
> ---
>  src/app/views/deployables/show.html.haml |    2 +-
>  src/config/routes.rb                     |    1 +
>  src/features/deployables.feature         |    2 +-
>  3 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/src/app/views/deployables/show.html.haml
> b/src/app/views/deployables/show.html.haml index 8d311e5..dbe5a97 100644
> --- a/src/app/views/deployables/show.html.haml
> +++ b/src/app/views/deployables/show.html.haml
> @@ -9,7 +9,7 @@
>          = link_to t('.edit_xml'), edit_polymorphic_path([@catalog,
> @deployable], :edit_xml => true), :class => 'button', :id =>
> 'edit_xml_button'
> 
>      - if @catalog.present? && @deployable_errors.empty? && @pushed_count >
> 0 -      = link_to t('.launch'), launch_new_deployments_path(:deployable_id
> => @deployable.id, :pool_id => @catalog.pool), :id =>
> :launch_deployment_button +      = link_to t('.launch'),
> launch_time_params_deployments_path(:deployable_id => @deployable.id,
> :deployment => { :name => @deployable.name, :pool_id => @catalog.pool }),
> :id => :launch_deployment_button -else
>        %a{:id => :launch_deployment_button, :class => 'disabled'}=
> t('.launch')
> 
> diff --git a/src/config/routes.rb b/src/config/routes.rb
> index 48c8e57..3d440a8 100644
> --- a/src/config/routes.rb
> +++ b/src/config/routes.rb
> @@ -106,6 +106,7 @@ Conductor::Application.routes.draw do
>        delete :multi_destroy
>        get 'launch_new'
>        post 'launch_time_params'
> +      get 'launch_time_params'
>        post 'overview'
>        get 'check_name'
>        get 'launch_from_catalog'
> diff --git a/src/features/deployables.feature
> b/src/features/deployables.feature index 922b02a..c73ac2e 100644
> --- a/src/features/deployables.feature
> +++ b/src/features/deployables.feature
> @@ -47,7 +47,7 @@ Feature: Manage Catalog Entries
>      And there is "front_hwp2" conductor hardware profile
>      And I am on testdepl's catalog entry page
>      When I follow "launch_deployment_button"
> -    Then I should be on the launch new deployments page
> +    Then I should be on the launch time params deployments page
> 
>    Scenario: Delete deployables
>      Given there is a "default" catalog

ACK



More information about the aeolus-devel mailing list