From ceaeac454bdce03b5fcc73dc89f3dc203f6131d4 Mon Sep 17 00:00:00 2001
From: JoenioCosta <JoenioCosta@3f533792-8f58-4932-b0fe-aaf55b0a4547>
Date: Fri, 18 Jul 2008 22:09:18 +0000
Subject: [PATCH] ActionItem556: use display_name instead of first_name

---
 app/models/person.rb             | 5 -----
 app/models/user.rb               | 4 ----
 app/views/shared/user_menu.rhtml | 2 +-
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/app/models/person.rb b/app/models/person.rb
index 69f3c40..78ac739 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -86,11 +86,6 @@ class Person < Profile
     end
   end
 
-  def first_name
-    re = '[-+*_\s\'´"]'
-    self.name.gsub(/^#{re}*/,'').split(/#{re}/)[0]
-  end
-
   has_and_belongs_to_many :favorite_enterprises, :class_name => 'Enterprise', :join_table => 'favorite_enteprises_people'
 
   def email_addresses
diff --git a/app/models/user.rb b/app/models/user.rb
index cf79735..cccf0d9 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -154,10 +154,6 @@ class User < ActiveRecord::Base
   def name
     person.name
   end
-  
-  def first_name
-    person.first_name
-  end
 
   protected
     # before filter 
diff --git a/app/views/shared/user_menu.rhtml b/app/views/shared/user_menu.rhtml
index 275d70c..3f218d1 100644
--- a/app/views/shared/user_menu.rhtml
+++ b/app/views/shared/user_menu.rhtml
@@ -9,7 +9,7 @@
     (current_user.person.image)?
     current_user.person.image.public_filename(:icon) : "/images/icons-bar/photo.png"
     %>" alt="<%= current_user.name %> Icon-Photo" title="" height="20" border="0"/>
-    <span><%= _("%s's Menu") % current_user.first_name %> </span>
+    <span><%= _("%s's Menu") % current_user.display_name %> </span>
   </div>
 
   <div id="user_menu_ul">
--
libgit2 0.21.2