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

Add functionality to return a specific message for zero hour blocks

Browse source
This commit is contained in:
Simon Poole 2017-02-18 13:53:21 +01:00
parent 9fb382eaa9
commit 823f6b4d36
3 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/application_controller.rb
View file

@ -152,10 +152,14 @@ class ApplicationController < ActionController::Base
# have we identified the user?
if @user
# check if the user has been banned
if @user.blocks.active.exists?
# NOTE: need slightly more helpful message than this.
user_block = @user.blocks.active.take
unless user_block.nil?
set_locale
report_error t("application.setup_user_auth.blocked"), :forbidden
if @user.blocks.active.take.zero_hour?
report_error t("application.setup_user_auth.blocked_zero_hour"), :forbidden
else
report_error t("application.setup_user_auth.blocked"), :forbidden
end
end
# if the user hasn't seen the contributor terms then don't