Download as
Browse Code »

Commit de1df63946efdd5ccc13ded623f177ec9fc39c25

Authored by Rodrigo Souto
1 parent 24cf091d
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

Update send_email_plugin mailer to new format

Showing 2 changed files with 11 additions and 8 deletions   Show diff stats
plugins/send_email/controllers/send_email_plugin_base_controller.rb
  Diff comments   View file @de1df63
@@ -11,7 +11,7 @@ module SendEmailPluginBaseController @@ -11,7 +11,7 @@ module SendEmailPluginBaseController
11 ) 11 )
12 @mail.subject = params[:subject] unless params[:subject].blank? 12 @mail.subject = params[:subject] unless params[:subject].blank?
13 if @mail.valid? 13 if @mail.valid?
14 - SendEmailPlugin::Sender.deliver_message(request.referer, @context_url, @mail) 14 + SendEmailPlugin::Sender.message(request.referer, @context_url, @mail).deliver
15 if request.xhr? 15 if request.xhr?
16 render :text => _('Message sent') 16 render :text => _('Message sent')
17 else 17 else
plugins/send_email/lib/send_email_plugin/sender.rb
  Diff comments   View file @de1df63
1 class SendEmailPlugin::Sender < Noosfero::Plugin::MailerBase 1 class SendEmailPlugin::Sender < Noosfero::Plugin::MailerBase
2 2
3 def message(referer, url, mail) 3 def message(referer, url, mail)
4 - recipients mail.to  
5 - from mail.from  
6 - subject "[#{mail.environment.name}] #{mail.subject}"  
7 - body :message => mail.message,  
8 - :referer => referer,  
9 - :context_url => url,  
10 - :params => mail.params 4 + @message = mail.message
  5 + @referer = referer
  6 + @context_url = url
  7 + @params = mail.params
  8 +
  9 + mail(
  10 + recipients: mail.to,
  11 + from: mail.from,
  12 + subject: "[#{mail.environment.name}] #{mail.subject}"
  13 + )
11 end 14 end
12 end 15 end