Add functionality to return a specific message for zero hour blocks

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 15b98e0a829beba89d1f066c9a35c5152b73741b..8a27a2fef2ff7d3041c0ce2f834e192dea052ed7 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -152,10 +152,14 @@ class ApplicationController < ActionController::Base
     # have we identified the user?
     if @user
       # check if the user has been banned
     # 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
         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
       end
 
       # if the user hasn't seen the contributor terms then don't

diff --git a/app/models/user_block.rb b/app/models/user_block.rb
index de14dcaa9617f351941b93925cc7b1453ee6357b..edea23c80aad2547c8c369e2e4a18d9d29d4f92c 100644 (file)
--- a/app/models/user_block.rb
+++ b/app/models/user_block.rb
@@ -26,6 +26,12 @@ class UserBlock < ActiveRecord::Base
     needs_view || ends_at > Time.now.getutc
   end
 
     needs_view || ends_at > Time.now.getutc
   end
 

+  ##
+  # returns true if the block is a "zero hour" block
+  def zero_hour?
+    needs_view && (ends_at.to_i == updated_at.to_i)
+  end
+

   ##
   # revokes the block, allowing the user to use the API again. the argument
   # is the user object who is revoking the ban.
   ##
   # revokes the block, allowing the user to use the API again. the argument
   # is the user object who is revoking the ban.

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 15a1912df6f5b9e3ac55689485c0ccf1ded102cf..1867a433f2dfc9ba70febed84d94996c6b592523 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1625,6 +1625,7 @@ en:
     require_moderator:
       not_a_moderator: "You need to be a moderator to perform that action."
     setup_user_auth:
     require_moderator:
       not_a_moderator: "You need to be a moderator to perform that action."
     setup_user_auth:

+      blocked_zero_hour: "You have an urgent message on the OpenStreetMap web site. You need to read the message before you will be able to save your edits."

       blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
       need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
   oauth:
       blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
       need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
   oauth: