Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

more sensible mailer option defaults

Browse source 
Conflicts:
	app/mailers/base_mailer.rb
	config/app_config.yml.SAMPLE
	spec/app_config.yml
This commit is contained in:
wvengen 2014-09-02 12:18:50 +02:00
parent ecf5601023
commit 63d52db91b
6 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/mailers/mailer.rb
View file

@ -87,9 +87,11 @@ class Mailer < ActionMailer::Base
private
# @todo this global stuff gives threading problems when foodcoops have different values! - pass args to `url_for` instead
def set_foodcoop_scope(foodcoop = FoodsoftConfig.scope)
ActionMailer::Base.default_url_options[:protocol] = FoodsoftConfig[:protocol]
ActionMailer::Base.default_url_options[:host] = FoodsoftConfig[:host]
[:protocol, :host, :port].each do |k|
ActionMailer::Base.default_url_options[k] = FoodsoftConfig[k] if FoodsoftConfig[k]
end
ActionMailer::Base.default_url_options[:foodcoop] = foodcoop
end