Download as
Browse Code »

Commit 9c9f0fbcf6f586fb71a768fd0706331fb15f228f

Authored by Rodrigo Souto
2 parents 5e8e25e9 8ac3abc1
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

Merge branch 'show_email_in_task' into 'master' 

Show email of requestor in AddMember task

Add user email on the screen to process the request to enter on the community.

softwarepublico issue: https://softwarepublico.gov.br/gitlab/softwarepublico/softwarepublico/issues/238

See merge request !696
Showing 2 changed files with 24 additions and 3 deletions   Show diff stats
app/models/add_member.rb
  Diff comments   View file @9c9f0fb
@@ -29,8 +29,10 @@ class AddMember < Task @@ -29,8 +29,10 @@ class AddMember < 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 < Task @@ -46,7 +48,9 @@ class AddMember < 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 @9c9f0fb
@@ -121,4 +121,21 @@ class AddMemberTest < ActiveSupport::TestCase @@ -121,4 +121,21 @@ class AddMemberTest < 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 'notification description with requestor email if requestor email is public' 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.email}\)/, task.target_notification_description)
  131 + end
  132 +
  133 + should 'notification description without requestor email if requestor email is not public' do
  134 + new_person = create_user('testuser').person
  135 + new_person.update_attributes!({:fields_privacy => {:email => '0'}})
  136 +
  137 + task = AddMember.new(:person => new_person, :organization => community)
  138 +
  139 + assert_not_match(/\(#{task.requestor.email}\)/, task.target_notification_description)
  140 + end
124 end 141 end