login fixed

rcb09003 · Nov 5, 2013 · 699a045 · 699a045
1 parent 3197de5
commit 699a045
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -1,5 +1,5 @@
 class UsersController < ApplicationController
-before_action :signed_in_user, only: [:index, :edit, :update, :destroy]
+  before_action :signed_in_user, only: [:index, :edit, :update, :destroy]
   before_action :correct_user,   only: [:edit, :update]
   before_action :admin_user,     only: :destroy
 
@@ -48,7 +48,7 @@ before_action :signed_in_user, only: [:index, :edit, :update, :destroy]
 
     # Before filters
 
-	    def admin_user
+	 def admin_user
       redirect_to(root_url) unless current_user.admin?
     end
 

diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb
@@ -11,17 +11,23 @@ module SessionsHelper
     !current_user.nil?
   end
 
+
   def current_user
     remember_token = User.encrypt(cookies[:remember_token])
     @current_user ||= User.find_by(remember_token: remember_token)
   end
+
+
+  def current_user=(user)
+    @current_user = user
+  end
 
   def current_user?(user)
     user == current_user
   end
 
 
-    def sign_out
+  def sign_out
     self.current_user = nil
     cookies.delete(:remember_token)
   end