From 5f60376c1dc7788a83a659f2d02ea1bbc3dc943c Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 12 Apr 2016 19:12:28 +0200 Subject: [PATCH] changes order in valuator select --- app/helpers/valuation_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/valuation_helper.rb b/app/helpers/valuation_helper.rb index 1d74e94fa..0983ea567 100644 --- a/app/helpers/valuation_helper.rb +++ b/app/helpers/valuation_helper.rb @@ -2,9 +2,9 @@ module ValuationHelper def valuator_select_options(valuator=nil) if valuator.present? - Valuator.where.not(id: valuator.id).order('users.username asc').includes(:user).collect { |v| [ v.description_or_email, v.id ] }.prepend([valuator.description_or_email, valuator.id]) + Valuator.where.not(id: valuator.id).order("description ASC").order("users.email ASC").includes(:user).collect { |v| [ v.description_or_email, v.id ] }.prepend([valuator.description_or_email, valuator.id]) else - Valuator.all.order('users.username asc').includes(:user).collect { |v| [ v.description_or_email, v.id ] } + Valuator.all.order("description ASC").order("users.email ASC").includes(:user).collect { |v| [ v.description_or_email, v.id ] } end end