From df454f12111dbd4fe2949052ce2aefea2e6fe1d5 Mon Sep 17 00:00:00 2001
From: rgarcia <voodoorai2000@gmail.com>
Date: Tue, 8 Mar 2016 12:58:48 +0100
Subject: [PATCH] fixes specs displaying admin name and email

---
 app/models/administrator.rb                      | 4 ++++
 app/views/admin/spending_proposals/show.html.erb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/models/administrator.rb b/app/models/administrator.rb
index 8a34fa349..fbf27ec7a 100644
--- a/app/models/administrator.rb
+++ b/app/models/administrator.rb
@@ -3,4 +3,8 @@ class Administrator < ActiveRecord::Base
   delegate :name, :email, to: :user
 
   validates :user_id, presence: true, uniqueness: true
+
+  def name_and_email
+    "#{name} (#{email})"
+  end
 end
diff --git a/app/views/admin/spending_proposals/show.html.erb b/app/views/admin/spending_proposals/show.html.erb
index fc826f747..d85181f55 100644
--- a/app/views/admin/spending_proposals/show.html.erb
+++ b/app/views/admin/spending_proposals/show.html.erb
@@ -31,7 +31,7 @@
 <h2><%= t("admin.spending_proposals.show.responsibles") %></h2>
 
 <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>
 
 <%= render 'shared/tags', taggable: @spending_proposal %>