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

Merge 0257c73176 into e11ad83b32

Browse source
This commit is contained in:
Stella Rouzi 2014-05-19 11:38:43 +00:00
commit efbab7f159
10 changed files with 775 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/application_controller.rb
View file

@ -3,6 +3,16 @@ class ApplicationController < ActionController::Base
protect_from_forgery
before_filter :get_conferences
before_filter :store_location
before_action :set_locale
def set_locale
I18n.locale = params[:locale] || I18n.default_locale
end
def default_url_options(options={})
logger.debug "default_url_options is passed options: #{options.inspect}\n"
{ :locale => ((I18n.locale == I18n.default_locale) ? nil : I18n.locale) }
end
def store_location
session[:return_to] = request.fullpath if request.get? and controller_name != "user_sessions" and controller_name != "sessions"