From 2014362aad2eb82d2b060c2f02c675541fc891f1 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Wed, 27 Apr 2016 16:27:26 +0200 Subject: [PATCH] Shows name if valuator description is empty --- app/models/valuator.rb | 4 ++++ app/views/admin/spending_proposals/index.html.erb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/models/valuator.rb b/app/models/valuator.rb index c7cb6e4a8..8b82d20b1 100644 --- a/app/models/valuator.rb +++ b/app/models/valuator.rb @@ -10,4 +10,8 @@ class Valuator < ActiveRecord::Base def description_or_email description.present? ? description : email end + + def description_or_name + description.present? ? description : name + end end diff --git a/app/views/admin/spending_proposals/index.html.erb b/app/views/admin/spending_proposals/index.html.erb index c4eec60d8..a1fe52c1b 100644 --- a/app/views/admin/spending_proposals/index.html.erb +++ b/app/views/admin/spending_proposals/index.html.erb @@ -68,7 +68,7 @@ <% if spending_proposal.valuators.size == 0 %> <%= t("admin.spending_proposals.index.no_valuators_assigned") %> <% else %> - <%= spending_proposal.valuators.collect(&:description).join(', ') %> + <%= spending_proposal.valuators.collect(&:description_or_name).join(', ') %> <% end %>