Refactor deletion tests in way_controller_test to use factories.

[rails.git] / app / controllers / application_controller.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d6516dc145b03679695ce146d70f97713b3df955..2ceeda7bea9f62fd24c8220cf239cba776b01e96 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -61,7 +61,8 @@ class ApplicationController < ActionController::Base
     # method, otherwise an OAuth token was used, which has to be checked.
     unless current_token.nil?
       unless current_token.read_attribute(cap)
     # method, otherwise an OAuth token was used, which has to be checked.
     unless current_token.nil?
       unless current_token.read_attribute(cap)

-        report_error "OAuth token doesn't have that capability.", :forbidden
+        set_locale
+        report_error t("oauth.permissions.missing"), :forbidden

         false
       end
     end
         false
       end
     end


@@ -152,11 +153,11 @@ 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

-      user_block =  @user.blocks.active.take
-      unless user_block.nil? 
+      user_block = @user.blocks.active.take
+      unless user_block.nil?

         set_locale
         set_locale

-        if  user_block.zero_hour?
-          report_error  t("application.setup_user_auth.blocked_zero_hour"), :forbidden
+        if user_block.zero_hour?
+          report_error t("application.setup_user_auth.blocked_zero_hour"), :forbidden

         else
           report_error t("application.setup_user_auth.blocked"), :forbidden
         end
         else
           report_error t("application.setup_user_auth.blocked"), :forbidden
         end


@@ -364,7 +365,8 @@ class ApplicationController < ActionController::Base
   rescue ActionView::Template::Error => ex
     ex = ex.original_exception
 
   rescue ActionView::Template::Error => ex
     ex = ex.original_exception
 

-    if ex.is_a?(ActiveRecord::StatementInvalid) && ex.message =~ /execution expired/
+    if ex.is_a?(Timeout::Error) ||
+       (ex.is_a?(ActiveRecord::StatementInvalid) && ex.message =~ /execution expired/)

       render :action => "timeout"
     else
       raise
       render :action => "timeout"
     else
       raise


@@ -407,6 +409,18 @@ class ApplicationController < ActionController::Base
   end
 
   def map_layout
   end
 
   def map_layout

+    append_content_security_policy_directives(
+      :connect_src => %w(nominatim.openstreetmap.org overpass-api.de router.project-osrm.org valhalla.mapzen.com),
+      :script_src => %w(graphhopper.com open.mapquestapi.com),
+      :img_src => %w(developer.mapquest.com)
+    )
+
+    if STATUS == :database_offline || STATUS == :api_offline
+      flash.now[:warning] = t("layouts.osm_offline")
+    elsif STATUS == :database_readonly || STATUS == :api_readonly
+      flash.now[:warning] = t("layouts.osm_read_only")
+    end
+

     request.xhr? ? "xhr" : "map"
   end
 
     request.xhr? ? "xhr" : "map"
   end