Merge remote-tracking branch 'upstream/pull/2698'

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

diff --git a/app/controllers/api/traces_controller.rb b/app/controllers/api/traces_controller.rb
index 5e95892e1b01924c30d219a421b0c7677a9452a0..6c77f9dc4bae539cb581a60402e372f49dc80d7d 100644 (file)
--- a/app/controllers/api/traces_controller.rb
+++ b/app/controllers/api/traces_controller.rb
@@ -1,31 +1,25 @@
 module Api
   class TracesController < ApiController
 module Api
   class TracesController < ApiController

-    layout "site", :except => :georss
-

     before_action :authorize_web
     before_action :set_locale
     before_action :authorize
 
     authorize_resource
 
     before_action :authorize_web
     before_action :set_locale
     before_action :authorize
 
     authorize_resource
 

-    before_action :check_database_readable, :except => [:api_read, :api_data]
-    before_action :check_database_writable, :only => [:api_create, :api_update, :api_delete]
-    before_action :check_api_readable, :only => [:api_read, :api_data]
-    before_action :check_api_writable, :only => [:api_create, :api_update, :api_delete]
-    before_action :offline_redirect, :only => [:api_create, :api_delete, :api_data]
+    before_action :check_database_readable, :except => [:show, :data]
+    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_error, :only => [:create, :destroy, :data]

     around_action :api_call_handle_error
 
     around_action :api_call_handle_error
 

-    def api_read
-      trace = Trace.visible.find(params[:id])
+    def show
+      @trace = Trace.visible.find(params[:id])

 
 

-      if trace.public? || trace.user == current_user
-        render :xml => trace.to_xml.to_s
-      else
-        head :forbidden
-      end
+      head :forbidden unless @trace.public? || @trace.user == current_user

     end
 
     end
 

-    def api_update
+    def update

       trace = Trace.visible.find(params[:id])
 
       if trace.user == current_user
       trace = Trace.visible.find(params[:id])
 
       if trace.user == current_user


@@ -38,7 +32,7 @@ module Api
       end
     end
 
       end
     end
 

-    def api_delete
+    def destroy

       trace = Trace.visible.find(params[:id])
 
       if trace.user == current_user
       trace = Trace.visible.find(params[:id])
 
       if trace.user == current_user


@@ -52,7 +46,7 @@ module Api
       end
     end
 
       end
     end
 

-    def api_data
+    def data

       trace = Trace.visible.find(params[:id])
 
       if trace.public? || trace.user == current_user
       trace = Trace.visible.find(params[:id])
 
       if trace.public? || trace.user == current_user


@@ -68,7 +62,7 @@ module Api
       end
     end
 
       end
     end
 

-    def api_create
+    def create

       tags = params[:tags] || ""
       description = params[:description] || ""
       visibility = params[:visibility]
       tags = params[:tags] || ""
       description = params[:description] || ""
       visibility = params[:visibility]


@@ -85,7 +79,7 @@ module Api
         trace = do_create(params[:file], tags, description, visibility)
 
         if trace.id
         trace = do_create(params[:file], tags, description, visibility)
 
         if trace.id

-          TraceImporterJob.perform_later(@trace) if Settings.trace_use_job_queue
+          TraceImporterJob.perform_later(trace) if Settings.trace_use_job_queue

           render :plain => trace.id.to_s
         elsif trace.valid?
           head :internal_server_error
           render :plain => trace.id.to_s
         elsif trace.valid?
           head :internal_server_error


@@ -162,8 +156,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 if Settings.status == "gpx_offline"

     end
   end
 end
     end
   end
 end