diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-04-19 11:09:41 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-04-19 11:09:41 +0100 |
| commit | 69be0151757f1802052b9895135d3047605e6338 (patch) | |
| tree | aaeab66bb26e21bbd582b243233db60f1a855f5d /app/controllers/admin_user_controller.rb | |
| parent | 17d8dad044dea0fc678d0bdc409700131685db86 (diff) | |
| parent | a33c560ab2a3a6c1090dc0334b85c46b9f45c107 (diff) | |
Merge branch 'develop' into purge-requests
Conflicts:
spec/controllers/request_controller_spec.rb
Diffstat (limited to 'app/controllers/admin_user_controller.rb')
| -rw-r--r-- | app/controllers/admin_user_controller.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/admin_user_controller.rb b/app/controllers/admin_user_controller.rb index b2c084739..249030537 100644 --- a/app/controllers/admin_user_controller.rb +++ b/app/controllers/admin_user_controller.rb @@ -74,10 +74,9 @@ class AdminUserController < AdminController def login_as @admin_user = User.find(params[:id]) # check user does exist - post_redirect = PostRedirect.new( :uri => main_url(user_url(@admin_user)), :user_id => @admin_user.id) + post_redirect = PostRedirect.new( :uri => main_url(user_url(@admin_user)), :user_id => @admin_user.id, :circumstance => "login_as" ) post_redirect.save! url = main_url(confirm_url(:email_token => post_redirect.email_token, :only_path => true)) - session[:user_id] = nil # Log out current (usually admin) user, so we get logged in as the other user redirect_to url end |