Download as
Browse Code »

Commit 87eec62e185dd38c2949243f61300226816f8c56

Authored by AntonioTerceiro
1 parent 074a66ad
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

ActionItem96: every person needs an e-mail address 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@615 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 15 additions and 0 deletions   Show diff stats
app/models/person.rb
  Diff comments   View file @87eec62
@@ -48,4 +48,8 @@ class Person < Profile @@ -48,4 +48,8 @@ class Person < Profile
48 self.person_info ||= PersonInfo.new 48 self.person_info ||= PersonInfo.new
49 self.person_info.person = self 49 self.person_info.person = self
50 end 50 end
  51 +
  52 + def email
  53 + self.user.nil? ? nil : self.user.email
  54 + end
51 end 55 end
test/unit/person_test.rb
  Diff comments   View file @87eec62
@@ -86,4 +86,15 @@ class PersonTest < Test::Unit::TestCase @@ -86,4 +86,15 @@ class PersonTest < Test::Unit::TestCase
86 assert p.has_permission?('edit_profile', e) 86 assert p.has_permission?('edit_profile', e)
87 assert !p.has_permission?('destroy_profile', e) 87 assert !p.has_permission?('destroy_profile', e)
88 end 88 end
  89 +
  90 + should 'get an email address from the associated user instance' do
  91 + p = User.create!(:login => 'jonh', :email => 'john@doe.org', :password => 'dhoe', :password_confirmation => 'dhoe').person
  92 + assert_equal 'john@doe.org', p.email
  93 + end
  94 +
  95 + should 'get no email address when there is no associated user' do
  96 + p = Person.new
  97 + assert_nil p.email
  98 + end
  99 +
89 end 100 end