[PATCH] BZ 848812 downcase sort strings
Matt Wagner
matt.wagner at redhat.com
Wed Aug 29 21:05:03 UTC 2012
On Thu, Aug 16, 2012 at 09:41:51AM -0400, Tzu-Mainn Chen wrote:
> ---
> src/app/controllers/logs_controller.rb | 13 ++++++++-----
> 1 files changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/src/app/controllers/logs_controller.rb b/src/app/controllers/logs_controller.rb
> index ef2ea7f..22e6bae 100644
> --- a/src/app/controllers/logs_controller.rb
> +++ b/src/app/controllers/logs_controller.rb
> @@ -186,20 +186,23 @@ class LogsController < ApplicationController
> case @order
> when t('logs.options.deployment_instance_order')
> @events = @events.sort_by {|event|
> - (event.source.nil? ? "" : event.source.name)}
> + (event.source.nil? ? "" : event.source.name.downcase)}
> when t('logs.options.state_order')
> @events = @events.sort_by {|event|
> (event.source.nil? ? "" :
> - (event.source.state.nil? ? "" : event.source.state))}
> + (event.source.state.nil? ? "" : event.source.state.downcase))}
> when t('logs.options.pool_order')
> @events = @events.sort_by {|event|
> - (event.source.nil? ? "" : event.source.pool_family.name)}
> + (event.source.nil? ? "" : event.source.pool_family.name.downcase)}
> when t('logs.options.provider_order')
> @events = @events.sort_by {|event|
> - (event.source.nil? ? "" : event.source.provider_account.name)}
> + source = event.source
> + (source.nil? ? "" :
> + (source.provider_account.nil? ? "" :
> + source.provider_account.name.downcase))}
> when t('logs.options.owner_order')
> @events = @events.sort_by {|event|
> - (event.source.nil? ? "" : event.source.owner.login)}
> + (event.source.nil? ? "" : event.source.owner.login.downcase)}
> end
>
> @paginated_events = paginate_collection(@events, params[:page], PER_PAGE)
> --
> 1.7.6.5
ACK. Tested and pushed to upstream master and to 1.1.
-- Matt
More information about the aeolus-devel
mailing list