Download as
Browse Code »

Commit b605f7cd9290817a210d5904bff0e524fa855a1c

Authored by Aurelio A. Heckert
Committed by Daniela Feitosa
1 parent 45e5f691
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

Allow User to respond "name", despite not having a related Person 

(ActionItem1933)
Showing 2 changed files with 13 additions and 1 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @b605f7c
@@ -195,7 +195,7 @@ class User < ActiveRecord::Base @@ -195,7 +195,7 @@ class User < ActiveRecord::Base
195 end 195 end
196 196
197 def name 197 def name
198 - person.name 198 + person ? person.name : login
199 end 199 end
200 200
201 def enable_email! 201 def enable_email!
test/unit/user_test.rb
  Diff comments   View file @b605f7c
@@ -397,6 +397,18 @@ class UserTest < Test::Unit::TestCase @@ -397,6 +397,18 @@ class UserTest < Test::Unit::TestCase
397 assert_equal 15, User.expires_chat_status_every 397 assert_equal 15, User.expires_chat_status_every
398 end 398 end
399 399
  400 + should 'respond name with related person name' do
  401 + user = create_user('testuser')
  402 + user.person.name = 'Test User'
  403 + assert_equal 'Test User', user.name
  404 + end
  405 +
  406 + should 'respond name with login, if there is no person related' do
  407 + user = create_user('testuser')
  408 + user.person = nil
  409 + assert_equal 'testuser', user.name
  410 + end
  411 +
400 protected 412 protected
401 def new_user(options = {}) 413 def new_user(options = {})
402 user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options)) 414 user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))