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

Handle attempts to agree terms by users with validation errors better

Browse source
This commit is contained in:
Tom Hughes 2010-10-12 20:34:49 +01:00
parent 7b3e8871d5
commit 2f0ed54206
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/user_controller.rb
View file

@ -32,7 +32,12 @@ class UserController < ApplicationController
if @user if @user
if @user.invalid? if @user.invalid?
if @user.new_record?
render :action => :new render :action => :new
else
flash[:errors] = @user.errors
redirect_to :action => :account, :display_name => @user.display_name
end
elsif @user.terms_agreed? elsif @user.terms_agreed?
redirect_to :action => :account, :display_name => @user.display_name redirect_to :action => :account, :display_name => @user.display_name
end end
@ -123,7 +128,7 @@ class UserController < ApplicationController
else else
if flash[:errors] if flash[:errors]
flash[:errors].each do |attr,msg| flash[:errors].each do |attr,msg|
attr = "new_email" if attr == "email" attr = "new_email" if attr == "email" and !@user.new_email.nil?
@user.errors.add(attr,msg) @user.errors.add(attr,msg)
end end
end end