cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid singleton serialisation errors

Browse source
This commit is contained in:
Tom Hughes 2013-08-07 17:35:10 +01:00
parent 95e8c63c2a
commit 5432409ab6
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/user_controller.rb
View file

@ -26,13 +26,12 @@ class UserController < ApplicationController
render :partial => "terms" render :partial => "terms"
else else
@title = t 'user.terms.title' @title = t 'user.terms.title'
@user ||= session[:new_user]
if !@user if @user and @user.terms_agreed?
redirect_to :action => :login, :referer => request.fullpath
elsif @user.terms_agreed?
# Already agreed to terms, so just show settings # Already agreed to terms, so just show settings
redirect_to :action => :account, :display_name => @user.display_name redirect_to :action => :account, :display_name => @user.display_name
elsif session[:new_user].nil?
redirect_to :action => :login, :referer => request.fullpath
end end
end end
end end