consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1059 from consul/valuator-name

Browse Source 
uses valuator description in select
This commit is contained in:
Enrique García
2016-04-12 18:58:39 +02:00
parent 3c46639d5c efc8115899
commit 5ff3b78c07
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/valuation_helper.rb
View File

@@ -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.name, v.id ] }.prepend([valuator.name, valuator.id])
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])
else
Valuator.all.order('users.username asc').includes(:user).collect { |v| [ v.name, v.id ] }
Valuator.all.order('users.username asc').includes(:user).collect { |v| [ v.description_or_email, v.id ] }
end
end

4
spec/features/admin/spending_proposals_spec.rb
View File

@@ -144,8 +144,8 @@ feature 'Admin spending proposals' do
end
scenario "Filtering by valuator", :js do
user = create(:user, username: 'Valuator 1')
valuator = create(:valuator, user: user)
user = create(:user)
valuator = create(:valuator, user: user, description: 'Valuator 1')
spending_proposal = create(:spending_proposal, title: "Realocate visitors")
spending_proposal.valuators << valuator