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

fix bug in user edit mailer view

Browse source
This commit is contained in:
maxwell 2011-03-14 10:35:36 -07:00
parent 01e3b3cc26
commit 28fc093a01
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/user.rb
View file

@ -179,7 +179,9 @@ class User < ActiveRecord::Base
######### Mailer ####################### ######### Mailer #######################
def mail(job, *args) def mail(job, *args)
pref = job.to_s.gsub('Job::Mail', '').underscore pref = job.to_s.gsub('Job::Mail', '').underscore
puts pref
unless self.disable_mail || self.user_preferences.exists?(:email_type => pref) unless self.disable_mail || self.user_preferences.exists?(:email_type => pref)
puts 'im mailin'
Resque.enqueue(job, *args) Resque.enqueue(job, *args)
end end
end end

2
app/views/users/edit.html.haml
View file

@ -106,7 +106,7 @@
%br %br
%p.checkbox_select %p.checkbox_select
= type.label t('.request_acceptence') = type.label t('.request_acceptence')
= type.check_box :request_acceptence, {:checked => @email_prefs['request_accpetence']}, false, true = type.check_box :request_acceptence, {:checked => @email_prefs['request_acceptance']}, false, true
%br %br
= f.submit t('.change') = f.submit t('.change')