From 2434eb2290a58a0c283a23acf2343b98aecff390 Mon Sep 17 00:00:00 2001
From: Tallys Martins <tallysmartins@gmail.com>
Date: Mon, 16 May 2016 19:04:32 -0300
Subject: [PATCH] Adds reject explanation to add member task

---
 app/helpers/application_helper.rb |  1 +
 app/models/add_member.rb          | 11 ++++++++---
 test/unit/add_member_test.rb      |  7 +++++++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b885133..c2aba18 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -981,6 +981,7 @@ module ApplicationHelper
     values = {}
     values.merge!(task.information[:variables]) if task.information[:variables]
     values.merge!({:requestor => link_to(task.requestor.name, task.requestor.url)}) if task.requestor
+    values.merge!({:target => link_to(task.target.name, task.target.url)}) if (task.target && task.target.respond_to?(:url))
     values.merge!({:subject => content_tag('span', task.subject, :class=>'task_target')}) if task.subject
     values.merge!({:linked_subject => link_to(content_tag('span', task.linked_subject[:text], :class => 'task_target'), task.linked_subject[:url])}) if task.linked_subject
     (task.information[:message] % values).html_safe
diff --git a/app/models/add_member.rb b/app/models/add_member.rb
index fbf0e3a..5e978ef 100644
--- a/app/models/add_member.rb
+++ b/app/models/add_member.rb
@@ -37,6 +37,10 @@ class AddMember < Task
     true
   end
 
+  def reject_details
+    true
+  end
+
   def footer
     true
   end
@@ -72,8 +76,9 @@ class AddMember < Task
   end
 
   def task_cancelled_message
-    _("Your request to enter community \"%{target} with the profile \"%{requestor}\" was not accepted. Please contact any profile admin from %{url} for more information.") %
-    {:target => self.target.name, :url => self.target.url,
-     :requestor => self.requestor.name}
+    _("Your request to enter community \"%{target}\" with the profile \"%{requestor}\" was not accepted. Please contact any profile admin from %{target} for more information. The following explanation was given: \n\n\"%{explanation}\"") %
+    {:target => self.target.name,
+     :requestor => self.requestor.name,
+     :explanation => self.reject_explanation}
   end
 end
diff --git a/test/unit/add_member_test.rb b/test/unit/add_member_test.rb
index 19905e1..132fc0c 100644
--- a/test/unit/add_member_test.rb
+++ b/test/unit/add_member_test.rb
@@ -149,4 +149,11 @@ class AddMemberTest < ActiveSupport::TestCase
 
     assert_no_match(/\(#{task.requestor.email}\)/, task.target_notification_description)
   end
+
+  should 'have cancel notification message with explanation' do
+    explanation_message = 'some explanation'
+    task = AddMember.new(:person => person, :organization => community,
+                         :reject_explanation => explanation_message)
+    assert_match(/#{explanation_message}/, task.task_cancelled_message)
+  end
 end
--
libgit2 0.21.2