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

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

diff --git a/app/controllers/traces_controller.rb b/app/controllers/traces_controller.rb
index 03487e7ab810cc175e3878197da8cdcbb17fa699..9ebad161396300fde5ade76fc6989d2777cda2ba 100644 (file)
--- a/app/controllers/traces_controller.rb
+++ b/app/controllers/traces_controller.rb
@@ -67,7 +67,6 @@ class TracesController < ApplicationController
 
     # final helper vars for view
     @target_user = target_user
-    @display_name = target_user.display_name if target_user
   end
 
   def mine
@@ -90,7 +89,6 @@ class TracesController < ApplicationController
   end
 
   def new
-    logger.info "new"
     @title = t ".upload_trace"
     @trace = Trace.new(:visibility => default_visibility)
   end
@@ -112,7 +110,7 @@ class TracesController < ApplicationController
         flash[:notice] = t ".trace_uploaded"
         flash[:warning] = t ".traces_waiting", :count => current_user.traces.where(:inserted => false).count if current_user.traces.where(:inserted => false).count > 4
 
-        TraceImporterJob.perform_later(@trace) if Settings.trace_use_job_queue
+        TraceImporterJob.perform_later(@trace)
         redirect_to :action => :index, :display_name => current_user.display_name
       else
         flash[:error] = t("traces.create.upload_failed") if @trace.valid?
@@ -196,7 +194,7 @@ class TracesController < ApplicationController
       trace.visible = false
       trace.save
       flash[:notice] = t ".scheduled_for_deletion"
-      TraceDestroyerJob.perform_later(trace) if Settings.trace_use_job_queue
+      TraceDestroyerJob.perform_later(trace)
       redirect_to :action => :index, :display_name => trace.user.display_name
     end
   rescue ActiveRecord::RecordNotFound
@@ -318,7 +316,6 @@ class TracesController < ApplicationController
   end
 
   def offline_redirect
-    logger.info "offline_redirect status is #{Settings.status}"
     render :action => :offline if Settings.status == "gpx_offline"
   end