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

fixes specs displaying admin name and email

Browse Source
This commit is contained in:
rgarcia
2016-03-08 12:58:48 +01:00
parent 543870062f
commit df454f1211
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/administrator.rb
View File

@@ -3,4 +3,8 @@ class Administrator < ActiveRecord::Base
delegate :name, :email, to: :user delegate :name, :email, to: :user
validates :user_id, presence: true, uniqueness: true validates :user_id, presence: true, uniqueness: true
def name_and_email
"#{name} (#{email})"
end
end end

2
app/views/admin/spending_proposals/show.html.erb
View File

@@ -31,7 +31,7 @@
<h2><%= t("admin.spending_proposals.show.responsibles") %></h2> <h2><%= t("admin.spending_proposals.show.responsibles") %></h2>
<p><strong><%= t("admin.spending_proposals.show.assigned_admin") %>:</strong> <p><strong><%= t("admin.spending_proposals.show.assigned_admin") %>:</strong>
<%= @spending_proposal.administrator.try(:name) || t("admin.spending_proposals.show.undefined") %> <%= @spending_proposal.administrator.try(:name_and_email) || t("admin.spending_proposals.show.undefined") %>
</p> </p>
<%= render 'shared/tags', taggable: @spending_proposal %> <%= render 'shared/tags', taggable: @spending_proposal %>