From 665964bcbba69829a4ff1e7d7bd936f90d49b3f7 Mon Sep 17 00:00:00 2001 From: elijah Date: Sun, 22 Dec 2013 01:45:41 -0800 Subject: locale prefix support: * set locale based on request header * enforce locale path prefix when current locale is not the default * note: don't use root_path anymore, instead use home_path --- users/app/controllers/controller_extension/authentication.rb | 2 +- users/app/controllers/sessions_controller.rb | 4 ++-- users/app/controllers/users_controller.rb | 2 +- users/app/views/sessions/new.html.haml | 2 +- users/app/views/users/new.html.haml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'users/app') diff --git a/users/app/controllers/controller_extension/authentication.rb b/users/app/controllers/controller_extension/authentication.rb index dca3664..d831fbe 100644 --- a/users/app/controllers/controller_extension/authentication.rb +++ b/users/app/controllers/controller_extension/authentication.rb @@ -23,7 +23,7 @@ module ControllerExtension::Authentication respond_to do |format| format.html do if logged_in? - redirect_to root_url, :alert => t(:not_authorized) + redirect_to home_url, :alert => t(:not_authorized) else redirect_to login_url, :alert => t(:not_authorized_login) end diff --git a/users/app/controllers/sessions_controller.rb b/users/app/controllers/sessions_controller.rb index ca228c2..0195f30 100644 --- a/users/app/controllers/sessions_controller.rb +++ b/users/app/controllers/sessions_controller.rb @@ -1,7 +1,7 @@ class SessionsController < ApplicationController def new - redirect_to root_path if logged_in? + redirect_to home_url if logged_in? @session = Session.new if authentication_errors @errors = authentication_errors @@ -11,7 +11,7 @@ class SessionsController < ApplicationController def destroy logout - redirect_to root_path + redirect_to home_url end # diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb index 0b32ec7..a874772 100644 --- a/users/app/controllers/users_controller.rb +++ b/users/app/controllers/users_controller.rb @@ -61,7 +61,7 @@ class UsersController < UsersBaseController else # let's remove the invalid session logout - redirect_to root_url + redirect_to home_url end end diff --git a/users/app/views/sessions/new.html.haml b/users/app/views/sessions/new.html.haml index 0939e00..771dc97 100644 --- a/users/app/views/sessions/new.html.haml +++ b/users/app/views/sessions/new.html.haml @@ -7,4 +7,4 @@ = f.input :password, :required => false, :input_html => { :id => :srp_password } .form-actions = f.button :submit, :value => t(:login), :class => 'btn-primary' - = link_to t(:cancel), root_path, :class => 'btn' + = link_to t(:cancel), home_path, :class => 'btn' diff --git a/users/app/views/users/new.html.haml b/users/app/views/users/new.html.haml index f8d14b5..aecf831 100644 --- a/users/app/views/users/new.html.haml +++ b/users/app/views/users/new.html.haml @@ -15,5 +15,5 @@ = f.input :password_confirmation, :required => false, :validate => true, :input_html => { :id => :srp_password_confirmation } .form-actions = f.button :submit, :value => t(:signup), :class => 'btn btn-primary' - = link_to t(:cancel), root_url, :class => 'btn' + = link_to t(:cancel), home_path, :class => 'btn' -- cgit v1.2.3