Commit 622b829e by Mykhailo Makohin

some changes in redirect if user not logged in

parent 14065b26
class Users::SessionsController < Devise::SessionsController
def new
super
end
def create
auth_options = { :recall => "#{'home#index'}" }
self.resource = warden.authenticate!(auth_options)
set_flash_message(:notice, :signed_in) if is_navigational_format?
sign_in(resource_name, resource)
if !session[:return_to].blank?
redirect_to session[:return_to]
session[:return_to] = nil
else
respond_with resource, :location => after_sign_in_path_for(resource)
end
end
end
\ No newline at end of file
class UsersController < ApplicationController
# skip_before_filter :verify_authenticity_token
before_filter :authenticate_user!
def index
@users = collection
......
......@@ -26,7 +26,7 @@
%link{:href => "favicons/apple-touch-icon180.png", :rel => "apple-touch-icon", :sizes => "180x180"}
%body
= render 'partials/modal'
- if current_page?(root_path)
- if current_page?(root_path) || current_page?('/users/sign_in')
= render 'partials/black_header'
- else
= render 'partials/white_header'
......
Rails.application.routes.draw do
root 'home#index'
devise_for :users, controllers: {omniauth_callbacks: "users/omniauth_callbacks",
registrations: "users", sessions: "users"}
registrations: "users", sessions: "users/sessions"}
resources :users
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment