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

Actually use user_block

Browse source
This commit is contained in:
Simon Poole 2017-02-18 16:17:46 +01:00
parent 823f6b4d36
commit 58c61c7962
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/application_controller.rb
View file

@ -155,7 +155,7 @@ class ApplicationController < ActionController::Base
user_block = @user.blocks.active.take user_block = @user.blocks.active.take
unless user_block.nil? unless user_block.nil?
set_locale set_locale
if @user.blocks.active.take.zero_hour? if user_block.zero_hour?
report_error t("application.setup_user_auth.blocked_zero_hour"), :forbidden report_error t("application.setup_user_auth.blocked_zero_hour"), :forbidden
else else
report_error t("application.setup_user_auth.blocked"), :forbidden report_error t("application.setup_user_auth.blocked"), :forbidden