nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

create a wrapper class for devise mailer, both so we can resquify it and so we can inject helpers

Browse source
This commit is contained in:
Maxwell Salzberg 2011-08-19 15:27:51 -07:00
parent e4062bf5fd
commit bb5ada6533
3 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/mailers/diaspora_devise_mailer.rb Normal file
View file

@ -0,0 +1,5 @@
class DiasporaDeviseMailer < DeviseMailer
include NotifierHelper
default :from => AppConfig[:smtp_sender_address]
end

13
config/initializers/devise.rb
View file

@ -15,21 +15,14 @@ end
Devise.setup do |config| Devise.setup do |config|
# Configure the e-mail address which will be shown in DeviseMailer. # Configure the e-mail address which will be shown in DeviseMailer.
if AppConfig[:smtp_sender_address]
config.mailer_sender = AppConfig[:smtp_sender_address]
else
unless Rails.env == 'test'
Rails.logger.warn("No smtp sender address set, mail may fail.")
puts "WARNING: No smtp sender address set, mail may fail."
end
config.mailer_sender = "please-change-me@config-initializers-devise.com"
end
# ==> ORM configuration # ==> ORM configuration
# Load and configure the ORM. Supports :active_record (default), :mongoid # Load and configure the ORM. Supports :active_record (default), :mongoid
# (bson_ext recommended) and :data_mapper (experimental). # (bson_ext recommended) and :data_mapper (experimental).
require 'devise/orm/active_record' require 'devise/orm/active_record'
# Configure the class responsible to send e-mails.
config.mailer = "DiasporaDeviseMailer"
# ==> Configuration for any authentication mechanism # ==> Configuration for any authentication mechanism
# Configure which keys are used when authenticating an user. By default is # Configure which keys are used when authenticating an user. By default is
# just :email. You can configure it to use [:username, :subdomain], so for # just :email. You can configure it to use [:username, :subdomain], so for

3
public/javascripts/contact-edit.js
View file

@ -5,7 +5,7 @@
var ContactEdit = { var ContactEdit = {
init: function(){ init: function(){
$.extend(ContactEdit, AspectsDropdown); $.extend(ContactEdit, AspectsDropdown);
$('.dropdown.aspect_membership .dropdown_list > li').live('click', function(evt){ $('.dropdown.aspect_membership .dropdown_list > li, .dropdown.inviter .dropdown_list >li').live('click', function(evt){
ContactEdit.processClick($(this), evt); ContactEdit.processClick($(this), evt);
}); });
// $('.button.resend').live('click', function(evt){ // $('.button.resend').live('click', function(evt){
@ -23,6 +23,7 @@ var ContactEdit = {
li.addClass('loading'); li.addClass('loading');
if (dropdown.hasClass('inviter')) { if (dropdown.hasClass('inviter')) {
ContactEdit.inviteFriend(li, evt); ContactEdit.inviteFriend(li, evt);
dropdown.html('sending, please wait...');
} }
else { else {
ContactEdit.toggleAspectMembership(li, evt); ContactEdit.toggleAspectMembership(li, evt);