Bump eslint from 7.3.1 to 7.4.0

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

diff --git a/app/controllers/traces_controller.rb b/app/controllers/traces_controller.rb
index a0852d2ce2665959714c02c35c5cdc4c03504425..03487e7ab810cc175e3878197da8cdcbb17fa699 100644 (file)
--- a/app/controllers/traces_controller.rb
+++ b/app/controllers/traces_controller.rb
@@ -7,9 +7,9 @@ class TracesController < ApplicationController
 
   authorize_resource
 
-  before_action :check_database_writable, :only => [:new, :create, :edit, :delete]
+  before_action :check_database_writable, :only => [:new, :create, :edit, :destroy]
   before_action :offline_warning, :only => [:mine, :show]
-  before_action :offline_redirect, :only => [:new, :create, :edit, :delete, :data]
+  before_action :offline_redirect, :only => [:new, :create, :edit, :destroy, :data]
 
   # Counts and selects pages of GPX traces for various criteria (by user, tags, public etc.).
   #  target_user - if set, specifies the user to fetch traces for.  if not set will fetch all traces
@@ -90,6 +90,7 @@ class TracesController < ApplicationController
   end
 
   def new
+    logger.info "new"
     @title = t ".upload_trace"
     @trace = Trace.new(:visibility => default_visibility)
   end
@@ -184,7 +185,7 @@ class TracesController < ApplicationController
     head :not_found
   end
 
-  def delete
+  def destroy
     trace = Trace.find(params[:id])
 
     if !trace.visible?
@@ -317,7 +318,8 @@ class TracesController < ApplicationController
   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