Fix errors with GPX offline mode

diff --git a/app/controllers/api/traces_controller.rb b/app/controllers/api/traces_controller.rb
index 8979704a71802167af2b374ea8f173259bd36215..000bb7f9036ec095bdf1df3d6c7db6954a1c1240 100644 (file)
--- a/app/controllers/api/traces_controller.rb
+++ b/app/controllers/api/traces_controller.rb
@@ -12,7 +12,7 @@ module Api
     before_action :check_database_writable, :only => [:create, :update, :destroy]
     before_action :check_api_readable, :only => [:show, :data]
     before_action :check_api_writable, :only => [:create, :update, :destroy]
     before_action :check_database_writable, :only => [:create, :update, :destroy]
     before_action :check_api_readable, :only => [:show, :data]
     before_action :check_api_writable, :only => [:create, :update, :destroy]

-    before_action :offline_redirect, :only => [:create, :destroy, :data]
+    before_action :offline_error, :only => [:create, :destroy, :data]

     around_action :api_call_handle_error
 
     def show
     around_action :api_call_handle_error
 
     def show


@@ -158,8 +158,8 @@ module Api
       trace
     end
 
       trace
     end
 

-    def offline_redirect
-      redirect_to :action => :offline if Settings.status == "gpx_offline"
+    def offline_error
+      report_error "GPX files offline for maintenance", :service_unavailable

     end
   end
 end
     end
   end
 end

diff --git a/app/controllers/traces_controller.rb b/app/controllers/traces_controller.rb
index b800d305e03fc495f9bc9a7bdf5752a2ebd83bcf..03487e7ab810cc175e3878197da8cdcbb17fa699 100644 (file)
--- a/app/controllers/traces_controller.rb
+++ b/app/controllers/traces_controller.rb
@@ -90,6 +90,7 @@ class TracesController < ApplicationController
   end
 
   def new
   end
 
   def new

+    logger.info "new"

     @title = t ".upload_trace"
     @trace = Trace.new(:visibility => default_visibility)
   end
     @title = t ".upload_trace"
     @trace = Trace.new(:visibility => default_visibility)
   end


@@ -317,7 +318,8 @@ class TracesController < ApplicationController
   end
 
   def offline_redirect
   end
 
   def offline_redirect

-    redirect_to :action => :offline if Settings.status == "gpx_offline"
+    logger.info "offline_redirect status is #{Settings.status}"
+    render :action => :offline if Settings.status == "gpx_offline"

   end
 
   def default_visibility
   end
 
   def default_visibility