Download as
Browse Code »

Commit cf1a23163ed92ba38185ae3264014dd8ee4a9197

Authored by AntonioTerceiro
1 parent eb2da975
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem315: fixing the fix 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1730 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 7 additions and 1 deletions   Show diff stats
app/models/person.rb
  Diff comments   View file @cf1a231
@@ -104,7 +104,7 @@ class Person < Profile @@ -104,7 +104,7 @@ class Person < Profile
104 hacked_after_create :insert_default_homepage_and_feed 104 hacked_after_create :insert_default_homepage_and_feed
105 105
106 def name 106 def name
107 - person_info.name || self[:name] 107 + person_info.nil? ? self[:name] : (person_info.name || self[:name])
108 end 108 end
109 109
110 end 110 end
test/unit/person_test.rb
  Diff comments   View file @cf1a231
@@ -209,4 +209,10 @@ class PersonTest < Test::Unit::TestCase @@ -209,4 +209,10 @@ class PersonTest < Test::Unit::TestCase
209 assert_equal 'José', p.name 209 assert_equal 'José', p.name
210 end 210 end
211 211
  212 + should 'fallback to login when person_info is not present' do
  213 + p = create_user('randomhacker').person
  214 + p.person_info = nil
  215 + assert_equal 'randomhacker', p.name
  216 + end
  217 +
212 end 218 end