From be87e02e4c5c89d88e528a0c45236238ae2fb762 Mon Sep 17 00:00:00 2001 From: yanxd Date: Thu, 15 May 2014 17:41:53 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E4=BB=8E=E4=B8=BB=E9=A1=B5=E7=99=BB?= =?UTF-8?q?=E9=99=86=E6=97=B6=E8=B7=B3=E8=BD=AC=E5=88=B0=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=BB=E9=A1=B5"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a794d612afe07a4332a1e5e76b3e9667b0cd6454. --- app/controllers/account_controller.rb | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 5f20ec912..cf39898fe 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -31,9 +31,9 @@ class AccountController < ApplicationController else authenticate_user end - #rescue AuthSourceException => e - # logger.error "An error occured when authenticating #{params[:username]}: #{e.message}" - # render_error :message => e.message + rescue AuthSourceException => e + logger.error "An error occured when authenticating #{params[:username]}: #{e.message}" + render_error :message => e.message end # Log out current user and redirect to welcome page @@ -277,18 +277,9 @@ class AccountController < ApplicationController end call_hook(:controller_account_success_authentication_after, {:user => user }) #by young - code = // - #根据home_url生产正则表达式 - class_eval("code = " + "/" + home_url.gsub(/\//,"\\\/") + "\\\/*(welcome)?\\\/*(\\\/index)?\/") - if code.match(params[:back_url]) - redirect_to user_activities_path(user) - else - #redirect_back_or_default my_page_path - redirect_back_or_default User.current - #redirect_to User.current - end - - +# redirect_back_or_default my_page_path + redirect_back_or_default User.current +# redirect_to User.current end def set_autologin_cookie(user)