changes order in valuator select

This commit is contained in:
rgarcia
2016-04-12 19:12:28 +02:00
parent 73a3fcc35f
commit 5f60376c1d

View File

@@ -2,9 +2,9 @@ module ValuationHelper
def valuator_select_options(valuator=nil) def valuator_select_options(valuator=nil)
if valuator.present? 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 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
end end