Download as
Browse Code »

Commit 95b5546d5fbf7e9d506fbfbf1bb844f61e918036

Authored by AntonioTerceiro
1 parent 523219ff
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

ActionItem36: changed Task to test a condition before sending e-mail. all tests 

for Task pass.


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1466 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 1 changed file with 15 additions and 1 deletions   Show diff stats
app/models/task.rb
  Diff comments   View file @95b5546
... ... @@ -128,9 +128,23 @@ class Task < ActiveRecord::Base
128 128 def perform
129 129 end
130 130  
  131 + # Tells wheter e-mail notifications must be sent or not. Returns
  132 + # <tt>true</tt> by default (i.e. notification are sent), but can be overriden
  133 + # in subclasses to disable notifications or even to send notifications based
  134 + # on some conditions.
  135 + def sends_email?
  136 + true
  137 + end
  138 +
131 139 # sends notification e-mail about a task, if the task has a requestor.
  140 + #
  141 + # If
132 142 def send_notification(action)
133   - TaskMailer.send("deliver_task_#{action}", self) if self.requestor
  143 + if sends_email?
  144 + if self.requestor
  145 + TaskMailer.send("deliver_task_#{action}", self)
  146 + end
  147 + end
134 148 end
135 149  
136 150 class << self
... ...