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

Fix exception when a suspended user tries to login

Browse source
This commit is contained in:
Tom Hughes 2012-01-23 14:31:06 +00:00
parent c6b295ab2d
commit 2c666b42d7
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/user_controller.rb
View file

@ -512,8 +512,7 @@ private
elsif user = User.authenticate(:username => username, :password => password, :pending => true)
failed_login t('user.login.account not active', :reconfirm => url_for(:action => 'confirm_resend', :display_name => user.display_name))
elsif User.authenticate(:username => username, :password => password, :suspended => true)
webmaster = link_to t('user.login.webmaster'), "mailto:webmaster@openstreetmap.org"
failed_login t('user.login.account suspended', :webmaster => webmaster)
failed_login t('user.login.account is suspended', :webmaster => "mailto:webmaster@openstreetmap.org")
else
failed_login t('user.login.auth failure')
end
@ -546,8 +545,7 @@ private
when "active", "confirmed" then
successful_login(user)
when "suspended" then
webmaster = link_to t('user.login.webmaster'), "mailto:webmaster@openstreetmap.org"
failed_login t('user.login.account suspended', :webmaster => webmaster)
failed_login t('user.login.account is suspended', :webmaster => "mailto:webmaster@openstreetmap.org")
else
failed_login t('user.login.auth failure')
end