X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7410b59a50af1eeee3a5b31dbb19fbfbb629c99c..fea1b5b88de731dd35d1f79d36ec40a8e8a1f6af:/app/controllers/traces_controller.rb diff --git a/app/controllers/traces_controller.rb b/app/controllers/traces_controller.rb index a0852d2ce..43977c3ce 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 @@ -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 @@ -111,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? @@ -184,7 +183,7 @@ class TracesController < ApplicationController head :not_found end - def delete + def destroy trace = Trace.find(params[:id]) if !trace.visible? @@ -195,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 @@ -257,7 +256,7 @@ class TracesController < ApplicationController filename = "/tmp/#{rand}" # ...and save the uploaded file to that location - File.open(filename, "wb") { |f| f.write(file.read) } + File.binwrite(filename, file.read) # Create the trace object, falsely marked as already # inserted to stop the import daemon trying to load it @@ -317,7 +316,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