Download as
Browse Code »

Commit ceaeac454bdce03b5fcc73dc89f3dc203f6131d4

Authored by JoenioCosta
1 parent f0c23c25
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem556: use display_name instead of first_name 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2286 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 1 additions and 10 deletions   Show diff stats
app/models/person.rb
  Diff comments   View file @ceaeac4
@@ -86,11 +86,6 @@ class Person < Profile @@ -86,11 +86,6 @@ class Person < Profile
86 end 86 end
87 end 87 end
88 88
89 - def first_name  
90 - re = '[-+*_\s\'´"]'  
91 - self.name.gsub(/^#{re}*/,'').split(/#{re}/)[0]  
92 - end  
93 -  
94 has_and_belongs_to_many :favorite_enterprises, :class_name => 'Enterprise', :join_table => 'favorite_enteprises_people' 89 has_and_belongs_to_many :favorite_enterprises, :class_name => 'Enterprise', :join_table => 'favorite_enteprises_people'
95 90
96 def email_addresses 91 def email_addresses
app/models/user.rb
  Diff comments   View file @ceaeac4
@@ -154,10 +154,6 @@ class User < ActiveRecord::Base @@ -154,10 +154,6 @@ class User < ActiveRecord::Base
154 def name 154 def name
155 person.name 155 person.name
156 end 156 end
157 -  
158 - def first_name  
159 - person.first_name  
160 - end  
161 157
162 protected 158 protected
163 # before filter 159 # before filter
app/views/shared/user_menu.rhtml
  Diff comments   View file @ceaeac4
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 (current_user.person.image)? 9 (current_user.person.image)?
10 current_user.person.image.public_filename(:icon) : "/images/icons-bar/photo.png" 10 current_user.person.image.public_filename(:icon) : "/images/icons-bar/photo.png"
11 %>" alt="<%= current_user.name %> Icon-Photo" title="" height="20" border="0"/> 11 %>" alt="<%= current_user.name %> Icon-Photo" title="" height="20" border="0"/>
12 - <span><%= _("%s's Menu") % current_user.first_name %> </span> 12 + <span><%= _("%s's Menu") % current_user.display_name %> </span>
13 </div> 13 </div>
14 14
15 <div id="user_menu_ul"> 15 <div id="user_menu_ul">