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

[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 07b6208af40deef2018a8beb14d33a558b5de2ef..956bcde6e82dccabb23e022919d0d87673e74ec3 100644 (file)
--- a/app/controllers/api/traces_controller.rb
+++ b/app/controllers/api/traces_controller.rb
@@ -2,7 +2,6 @@ module Api
   class TracesController < ApiController
     before_action :check_database_readable, :except => [:show, :data]
     before_action :check_database_writable, :only => [:create, :update, :destroy]
   class TracesController < ApiController
     before_action :check_database_readable, :except => [:show, :data]
     before_action :check_database_writable, :only => [:create, :update, :destroy]

-    before_action :authorize_web

     before_action :set_locale
     before_action :authorize
 
     before_action :set_locale
     before_action :authorize
 


@@ -36,7 +35,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)
+          trace.schedule_import

           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


@@ -67,7 +66,7 @@ module Api
       if trace.user == current_user
         trace.visible = false
         trace.save!
       if trace.user == current_user
         trace.visible = false
         trace.save!

-        TraceDestroyerJob.perform_later(trace)
+        trace.schedule_destruction

 
         head :ok
       else
 
         head :ok
       else


@@ -116,7 +115,7 @@ module Api
       trace.save!
 
       # Finally save the user's preferred privacy level
       trace.save!
 
       # Finally save the user's preferred privacy level

-      if pref = current_user.preferences.where(:k => "gps.trace.visibility").first
+      if pref = current_user.preferences.find_by(:k => "gps.trace.visibility")

         pref.v = visibility
         pref.save
       else
         pref.v = visibility
         pref.save
       else