From de1df63946efdd5ccc13ded623f177ec9fc39c25 Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Tue, 13 May 2014 19:58:02 -0300 Subject: [PATCH] Update send_email_plugin mailer to new format --- plugins/send_email/controllers/send_email_plugin_base_controller.rb | 2 +- plugins/send_email/lib/send_email_plugin/sender.rb | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/plugins/send_email/controllers/send_email_plugin_base_controller.rb b/plugins/send_email/controllers/send_email_plugin_base_controller.rb index 438eba4..59afa94 100644 --- a/plugins/send_email/controllers/send_email_plugin_base_controller.rb +++ b/plugins/send_email/controllers/send_email_plugin_base_controller.rb @@ -11,7 +11,7 @@ module SendEmailPluginBaseController ) @mail.subject = params[:subject] unless params[:subject].blank? if @mail.valid? - SendEmailPlugin::Sender.deliver_message(request.referer, @context_url, @mail) + SendEmailPlugin::Sender.message(request.referer, @context_url, @mail).deliver if request.xhr? render :text => _('Message sent') else diff --git a/plugins/send_email/lib/send_email_plugin/sender.rb b/plugins/send_email/lib/send_email_plugin/sender.rb index 129f9ce..7ad9165 100644 --- a/plugins/send_email/lib/send_email_plugin/sender.rb +++ b/plugins/send_email/lib/send_email_plugin/sender.rb @@ -1,12 +1,15 @@ class SendEmailPlugin::Sender < Noosfero::Plugin::MailerBase def message(referer, url, mail) - recipients mail.to - from mail.from - subject "[#{mail.environment.name}] #{mail.subject}" - body :message => mail.message, - :referer => referer, - :context_url => url, - :params => mail.params + @message = mail.message + @referer = referer + @context_url = url + @params = mail.params + + mail( + recipients: mail.to, + from: mail.from, + subject: "[#{mail.environment.name}] #{mail.subject}" + ) end end -- libgit2 0.21.2