[PATCH conductor] BZ 831687 Fixed empty flash warning message on deployments#launch_time_params
Justin Clift
jclift at redhat.com
Tue Jul 24 16:35:00 UTC 2012
On 25/07/2012, at 1:51 AM, jzigmund at redhat.com wrote:
> From: Jozef Zigmund <jzigmund at redhat.com>
>
> ---
> src/app/controllers/deployments_controller.rb | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/app/controllers/deployments_controller.rb b/src/app/controllers/deployments_controller.rb
> index 99cee49..d9ec800 100644
> --- a/src/app/controllers/deployments_controller.rb
> +++ b/src/app/controllers/deployments_controller.rb
> @@ -89,7 +89,8 @@ class DeploymentsController < ApplicationController
> end
>
> # check that type attrs on service params are used properly
> - if warnings = @deployable.check_service_params_types
> + warnings = @deployable.check_service_params_types
> + unless warnings.empty?
> flash[:warning] ||= []
> flash[:warning] = [flash[:warning]] if flash[:warning].kind_of? String
> flash[:warning]+=warnings
> --
> 1.7.10.4
Tested here, works fine. ACK. :)
+ Justin
--
Aeolus Community Manager
http://www.aeolusproject.org
More information about the aeolus-devel
mailing list