X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/90e2a144dca37f910eb70107158773a8c23ea469..e222329d043592af299eed12cf6ad16969c1b46f:/app/controllers/traces_controller.rb

diff --git a/app/controllers/traces_controller.rb b/app/controllers/traces_controller.rb
index a0852d2ce..0d3a1aa33 100644
--- 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
@@ -184,7 +184,7 @@ class TracesController < ApplicationController
     head :not_found
   end
 
-  def delete
+  def destroy
     trace = Trace.find(params[:id])
 
     if !trace.visible?
@@ -317,7 +317,7 @@ class TracesController < ApplicationController
   end
 
   def offline_redirect
-    redirect_to :action => :offline if Settings.status == "gpx_offline"
+    render :action => :offline if Settings.status == "gpx_offline"
   end
 
   def default_visibility