Moving password field and fixing a nil error in appcontroller

2013-01-25 08:45:43 -07:00
parent 6d0a7b165a
commit 95374a8c1f
2 changed files with 15 additions and 15 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -2,7 +2,7 @@ class ApplicationController < ActionController::Base
  protect_from_forgery

  rescue_from CanCan::AccessDenied do |exception|  
-    if current_user.orientation.blank? then
+    if !current_user.nil? && current_user.orientation.blank? then
      flash[:alert] = "Sorry, you need to complete New Member Orientation before having access to this page. <br/>Please check your email and schedule a New Member Orientation with a volunteer."
      redirect_to root_url
    end