Download as
Browse Code »

Commit 8ca4dca65bb8b2daefa7eff723f95bb3c6917cf8

Authored by Leandro Nunes dos Santos
1 parent 3183c63b
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

new users should create person with name equals to user name not user login

Showing 2 changed files with 14 additions and 1 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @8ca4dca
@@ -31,7 +31,7 @@ class User < ActiveRecord::Base @@ -31,7 +31,7 @@ class User < ActiveRecord::Base
31 after_create do |user| 31 after_create do |user|
32 user.person ||= Person.new 32 user.person ||= Person.new
33 user.person.attributes = user.person_data.merge(:identifier => user.login, :user => user, :environment_id => user.environment_id) 33 user.person.attributes = user.person_data.merge(:identifier => user.login, :user => user, :environment_id => user.environment_id)
34 - user.person.name ||= user.login 34 + user.person.name ||= user.name
35 user.person.visible = false unless user.activated? 35 user.person.visible = false unless user.activated?
36 user.person.save! 36 user.person.save!
37 if user.environment.enabled?('skip_new_user_email_confirmation') 37 if user.environment.enabled?('skip_new_user_email_confirmation')
test/unit/user_test.rb
  Diff comments   View file @8ca4dca
@@ -617,6 +617,19 @@ class UserTest < ActiveSupport::TestCase @@ -617,6 +617,19 @@ class UserTest < ActiveSupport::TestCase
617 end 617 end
618 end 618 end
619 619
  620 + should 'create person with name equal to user name if a user name is defined' do
  621 + user = User.new( :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' )
  622 + user.name = "Some name"
  623 + user.save
  624 + assert_equal 'Some name', user.person.name
  625 + end
  626 +
  627 + should 'create person with name equal to user login if no user name is defined' do
  628 + user = User.new( :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' )
  629 + user.save
  630 + assert_equal 'quire', user.person.name
  631 + end
  632 +
620 protected 633 protected
621 def new_user(options = {}) 634 def new_user(options = {})
622 user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options)) 635 user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))