gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Update devise to latest version

Browse source 
* use letter_opener for mails in development
* bring back the flash
* fix redirect loop for logging in
* move all mailer/devise settings to config/config.yml
This commit is contained in:
Henne Vogelsang 2014-03-24 12:45:04 +01:00
parent 7920c3df65
commit 18968a05b1
11 changed files with 53 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/email_settings.rb
View file

@ -8,12 +8,12 @@ class EmailSettings < ActiveRecord::Base
"email" => person.email,
"name" => person.public_name,
"conference" => conference.title,
"registrationlink" => Rails.application.routes.url_helpers.register_conference_url(conference.short_title, :host => OSEM_CONFIG["url_for_emails"])
"registrationlink" => Rails.application.routes.url_helpers.register_conference_url(conference.short_title, :host => CONFIG["url_for_emails"])
}
if !event.nil?
h["eventtitle"] = event.title
h["proposalslink"] = Rails.application.routes.url_helpers.conference_proposal_url(conference.short_title, event, :host => OSEM_CONFIG["url_for_emails"])
h["proposalslink"] = Rails.application.routes.url_helpers.conference_proposal_url(conference.short_title, event, :host => CONFIG["url_for_emails"])
end
h
end