Download as
Browse Code »

Commit 3c238164839ef31ce33be6cf7e78b438c23250d8

Authored by Luciano Prestes
Committed by Thiago Ribeiro
1 parent d82ee357
Exists in stable-spb-1.4 and in 8 other branches article-list-template, contact_admin_translation, noosfero_spb_ci, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, remote_user_fix, stable-spb-1.3, stable-spb-1.3-fixes

Show email of requestor in AddMember task 

Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com>
Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com>
Showing 2 changed files with 15 additions and 3 deletions   Show diff stats
app/models/add_member.rb
  Diff comments   View file @3c23816
@@ -29,8 +29,10 @@ class AddMember &lt; Task @@ -29,8 +29,10 @@ class AddMember &lt; Task
29 end 29 end
30 30
31 def information 31 def information
32 - {:message => _("%{requestor} wants to be a member of '%{organization}'."),  
33 - variables: {requestor: requestor.name, organization: organization.name}} 32 + requestor_email = " (#{requestor.email})" if requestor.may_display_field_to?("email")
  33 +
  34 + {:message => _("%{requestor}%{requestor_email} wants to be a member of '%{organization}'."),
  35 + variables: {requestor: requestor.name, requestor_email: requestor_email, organization: organization.name}}
34 end 36 end
35 37
36 def accept_details 38 def accept_details
@@ -46,7 +48,9 @@ class AddMember &lt; Task @@ -46,7 +48,9 @@ class AddMember &lt; Task
46 end 48 end
47 49
48 def target_notification_description 50 def target_notification_description
49 - _("%{requestor} wants to be a member of '%{organization}'.") % {:requestor => requestor.name, :organization => organization.name} 51 + requestor_email = " (#{requestor.email})" if requestor.may_display_field_to?("email")
  52 +
  53 + _("%{requestor}%{requestor_email} wants to be a member of '%{organization}'.") % {:requestor => requestor.name, :requestor_email => requestor_email, :organization => organization.name}
50 end 54 end
51 55
52 def target_notification_message 56 def target_notification_message
test/unit/add_member_test.rb
  Diff comments   View file @3c23816
@@ -121,4 +121,12 @@ class AddMemberTest &lt; ActiveSupport::TestCase @@ -121,4 +121,12 @@ class AddMemberTest &lt; ActiveSupport::TestCase
121 assert_match(/#{task.requestor.name} wants to be a member of '#{community.name}'/, email.subject) 121 assert_match(/#{task.requestor.name} wants to be a member of '#{community.name}'/, email.subject)
122 end 122 end
123 123
  124 + should 'have target notification description with requestor email' do
  125 + new_person = create_user('testuser').person
  126 + new_person.update_attributes!({:fields_privacy => {:email => 'public'}})
  127 +
  128 + task = AddMember.new(:person => new_person, :organization => community)
  129 +
  130 + assert_match(/#{task.requestor.name} \(#{task.requestor.email}\) wants to be a member of '#{community.name}'./, task.target_notification_description)
  131 + end
124 end 132 end