[Git][noosfero/noosfero][master] 2 commits: Adds reject explanation to add member task

[Marcos Ronaldo Pereira Junior]

Marcos Ronaldo Pereira Junior pushed to branch master at Noosfero / noosfero


Commits:
74f38941 by Tallys Martins at 2016-05-20T20:36:19+00:00
Adds reject explanation to add member task

Signed-off-by: Gabriel Silva <gabriel93.silva at gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2 at gmail.com>
Signed-off-by: Tallys Martins <tallysmartins at gmail.com>
Signed-off-by: Thiago Ribeiro <thiagitosouza at gmail.com>

- - - - -
315ed27e by Marcos Ronaldo Pereira Junior at 2016-05-20T22:34:17+00:00
Merge branch 'add_member_task_reject_details' into 'master'

AddMemberTask explanation message

Adds explanation field to reject details in add member task

See merge request !921
- - - - -


3 changed files:

- app/helpers/application_helper.rb
- app/models/add_member.rb
- test/unit/add_member_test.rb


Changes:

=====================================
app/helpers/application_helper.rb
=====================================
--- 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


=====================================
app/models/add_member.rb
=====================================
--- 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


=====================================
test/unit/add_member_test.rb
=====================================
--- 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



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/fd9ab99d45482bf9f1ea5d8edda2bea0af793085...315ed27e4c783ea9ae2fc76dc3e117f67e863593
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20160520/70fba99f/attachment-0001.html>