From db6acebb6cf5b3411e78535db4e1ae5c4cc09c3c Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Sun, 21 Aug 2011 19:11:46 -0700 Subject: [PATCH] Need to define mailer_name in the mailer wrapper class, or devise can't find the email templates. Also, for some reason, had to move the include of NotifierHelper to the view itself. That requires more investigation. --- app/mailers/diaspora_devise_mailer.rb | 4 +++- app/views/devise/mailer/invitation_instructions.erb | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/mailers/diaspora_devise_mailer.rb b/app/mailers/diaspora_devise_mailer.rb index 3ec4cbb63..c74f86ab2 100644 --- a/app/mailers/diaspora_devise_mailer.rb +++ b/app/mailers/diaspora_devise_mailer.rb @@ -1,5 +1,7 @@ class DiasporaDeviseMailer < Devise::Mailer - include NotifierHelper default :from => AppConfig[:smtp_sender_address] + def self.mailer_name + "devise/mailer" + end end diff --git a/app/views/devise/mailer/invitation_instructions.erb b/app/views/devise/mailer/invitation_instructions.erb index 9e27bba76..fc8256187 100644 --- a/app/views/devise/mailer/invitation_instructions.erb +++ b/app/views/devise/mailer/invitation_instructions.erb @@ -1,3 +1,4 @@ +<%- self.extend NotifierHelper -%> <% @invites = @resource.invitations_to_me.includes(:sender =>{:person => :profile}).where(:admin => false).all%> <%=invite_email_title %>