Skip to content
Extraits de code Groupes Projets
Valider bb5ada65 rédigé par Maxwell Salzberg's avatar Maxwell Salzberg
Parcourir les fichiers

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

parent e4062bf5
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
class DiasporaDeviseMailer < DeviseMailer
include NotifierHelper
default :from => AppConfig[:smtp_sender_address]
end
......@@ -15,21 +15,14 @@ end
Devise.setup do |config|
# 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
# Load and configure the ORM. Supports :active_record (default), :mongoid
# (bson_ext recommended) and :data_mapper (experimental).
require 'devise/orm/active_record'
# Configure the class responsible to send e-mails.
config.mailer = "DiasporaDeviseMailer"
# ==> Configuration for any authentication mechanism
# Configure which keys are used when authenticating an user. By default is
# just :email. You can configure it to use [:username, :subdomain], so for
......
......@@ -5,7 +5,7 @@
var ContactEdit = {
init: function(){
$.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);
});
// $('.button.resend').live('click', function(evt){
......@@ -23,6 +23,7 @@ var ContactEdit = {
li.addClass('loading');
if (dropdown.hasClass('inviter')) {
ContactEdit.inviteFriend(li, evt);
dropdown.html('sending, please wait...');
}
else {
ContactEdit.toggleAspectMembership(li, evt);
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter