@@ -2,44 +2,44 @@ class UserMailer < ActionMailer::Base def signup_notification(user) setup_email(user) @subject += 'Please activate your new account' - @body[:url] = "http://#{Setting.get(:site_url)}/activate/#{user.activation_code}" + @body[:url] = "http://#{configatron.site_url}/activate/#{user.activation_code}" end def reset_password(user) setup_email(user) @subject += "Your password has been reset" - @body[:url] = "http://#{Setting.get(:site_url)}/login" + @body[:url] = "http://#{configatron.site_url}/login" end def forgot_password(user) setup_email(user) @subject += "Forgotten password instructions" - @body[:url] = "http://#{Setting.get(:site_url)}/users/reset_password/#{user.password_reset_code}" + @body[:url] = "http://#{configatron.site_url}/users/reset_password/#{user.password_reset_code}" end def forgot_login(user) setup_email(user) @subject += "Forgotten account login" - @body[:url] = "http://#{Setting.get(:site_url)}/login" + @body[:url] = "http://#{configatron.site_url}/login" end def activation(user) setup_email(user) @subject += 'Your account has been activated!' - @body[:url] = "http://#{Setting.get(:site_url)}/" + @body[:url] = "http://#{configatron.site_url}/" end protected def setup_email(user) @recipients = "#{user.email}" - @from = "#{Setting.get(:support_name)} <#{Setting.get(:support_email)}>" - @subject = "[#{Setting.get(:site_name)}] " + @from = "#{configatron.support_name} <#{configatron.support_email}>" + @subject = "[#{configatron.site_name}] " @sent_on = Time.now @body[:user] = user # Get Settings [:site_name, :company_name, :support_email, :support_name].each do |id| - @body[id] = Setting.get(id) + @body[id] = configatron.send(id) end end end app/models/user_mailer.rb @@ -3,7 +3,7 @@ development: &local site_name: BaseApp - site_url: http://baseapp.local + site_url: baseapp.local company_name: Kabisa ICT admin_email: admin@test.com config/config.yml @@ -24,7 +24,7 @@ class Baseapp < ActiveRecord::Migration t.string :activation_code, :limit => 40 t.string :state, :null => :false, :default => 'passive' t.datetime :remember_token_expires_at - t.string :password_reset_cod, :default => nil + t.string :password_reset_code, :default => nil t.datetime :activated_at t.datetime :deleted_at t.timestamps db/migrate/20081023115224_baseapp.rb 57b28f21a487debfafba0d1af1567e66ea5fa4db Ariejan de Vroom ariejan@ariejan.net http://github.com/ariejan/baseapp/commit/cecca9c4455d37f121a0df9c258cb2b845d4bf10 cecca9c4455d37f121a0df9c258cb2b845d4bf10 2008-12-22T05:17:32-08:00 2008-12-22T05:17:32-08:00 Fixed bug in migrations; Fixed UserMailer to use Configatron correctly. 4b3dc662414aa5db742f9be9dd5827e6ce60f807 Ariejan de Vroom ariejan@ariejan.net