From 28fc093a013391bebe8021207ad83f370938d2a8 Mon Sep 17 00:00:00 2001 From: maxwell Date: Mon, 14 Mar 2011 10:35:36 -0700 Subject: [PATCH] fix bug in user edit mailer view --- app/models/user.rb | 2 ++ app/views/users/edit.html.haml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index 5470b6365..684a11ca4 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -179,7 +179,9 @@ class User < ActiveRecord::Base ######### Mailer ####################### def mail(job, *args) pref = job.to_s.gsub('Job::Mail', '').underscore + puts pref unless self.disable_mail || self.user_preferences.exists?(:email_type => pref) + puts 'im mailin' Resque.enqueue(job, *args) end end diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml index f32d7b002..8170f6ef9 100644 --- a/app/views/users/edit.html.haml +++ b/app/views/users/edit.html.haml @@ -106,7 +106,7 @@ %br %p.checkbox_select = 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 = f.submit t('.change')