Commit de1df63946efdd5ccc13ded623f177ec9fc39c25
1 parent
24cf091d
Exists in
master
and in
22 other branches
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
| ... | ... | @@ -11,7 +11,7 @@ module SendEmailPluginBaseController |
| 11 | 11 | ) |
| 12 | 12 | @mail.subject = params[:subject] unless params[:subject].blank? |
| 13 | 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 | 15 | if request.xhr? |
| 16 | 16 | render :text => _('Message sent') |
| 17 | 17 | else | ... | ... |
plugins/send_email/lib/send_email_plugin/sender.rb
| 1 | 1 | class SendEmailPlugin::Sender < Noosfero::Plugin::MailerBase |
| 2 | 2 | |
| 3 | 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 | 14 | end |
| 12 | 15 | end | ... | ... |