Download as
Browse Code »

Commit ca6196698d79b96986d55e8ef5f66a51783f5d0b

Authored by Tallys Martins
Committed by Gabriel Silva
1 parent 09ba5847
Exists in add_member_task_reject_details

Adds reject explanation to add member task 

Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com>
Showing 2 changed files with 14 additions and 2 deletions   Show diff stats
app/models/add_member.rb
  Diff comments   View file @ca61966
@@ -37,6 +37,10 @@ class AddMember &lt; Task @@ -37,6 +37,10 @@ class AddMember &lt; Task
37 true 37 true
38 end 38 end
39 39
  40 + def reject_details
  41 + true
  42 + end
  43 +
40 def footer 44 def footer
41 true 45 true
42 end 46 end
@@ -72,8 +76,9 @@ class AddMember &lt; Task @@ -72,8 +76,9 @@ class AddMember &lt; Task
72 end 76 end
73 77
74 def task_cancelled_message 78 def task_cancelled_message
75 - _("Your request to enter community \"%{target} with the profile \"%{requestor}\" was not accepted. Please contact any profile admin from %{url} for more information.") % 79 + _("Your request to enter community \"%{target} with the profile \"%{requestor}\" was not accepted. Please contact any profile admin from %{url} for more information. The following explanation was given: \n\n\"%{explanation}\"") %
76 {:target => self.target.name, :url => self.target.url, 80 {:target => self.target.name, :url => self.target.url,
77 - :requestor => self.requestor.name} 81 + :requestor => self.requestor.name,
  82 + :explanation => self.reject_explanation}
78 end 83 end
79 end 84 end
test/unit/add_member_test.rb
  Diff comments   View file @ca61966
@@ -149,4 +149,11 @@ class AddMemberTest &lt; ActiveSupport::TestCase @@ -149,4 +149,11 @@ class AddMemberTest &lt; ActiveSupport::TestCase
149 149
150 assert_no_match(/\(#{task.requestor.email}\)/, task.target_notification_description) 150 assert_no_match(/\(#{task.requestor.email}\)/, task.target_notification_description)
151 end 151 end
  152 +
  153 + should 'have cancel notification message with explanation' do
  154 + explanation_message = 'some explanation'
  155 + task = AddMember.new(:person => person, :organization => community,
  156 + :reject_explanation => explanation_message)
  157 + assert_match(/#{explanation_message}/, task.task_cancelled_message)
  158 + end
152 end 159 end