* Update devise to latest version
* 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:
parent
7920c3df65
commit
18968a05b1
11 changed files with 53 additions and 16 deletions
|
|
@ -7,7 +7,7 @@ body {
|
|||
margin-bottom: 60px;
|
||||
}
|
||||
|
||||
body > #content {
|
||||
body > #messages {
|
||||
padding: 60px 15px 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,13 @@ class ApplicationController < ActionController::Base
|
|||
end
|
||||
|
||||
def after_sign_in_path_for(resource)
|
||||
session[:return_to]
|
||||
if not session[:return_to].start_with?('/accounts')
|
||||
logger.debug "Returning to #{session[:return_to]}"
|
||||
session[:return_to]
|
||||
else
|
||||
logger.debug "Not returning to #{session[:return_to]} because it would loop"
|
||||
super
|
||||
end
|
||||
end
|
||||
|
||||
def get_conferences
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue