X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/995bfa91ff353e60db66139fc566d88435d3723e..86fae8980d97ba7fdd9345eb5e372fd4f8f20b7f:/app/controllers/api/traces_controller.rb?ds=sidebyside diff --git a/app/controllers/api/traces_controller.rb b/app/controllers/api/traces_controller.rb index d9b5bce25..e91261058 100644 --- a/app/controllers/api/traces_controller.rb +++ b/app/controllers/api/traces_controller.rb @@ -1,14 +1,13 @@ module Api class TracesController < ApiController - before_action :check_api_readable, :only => [:show, :data] before_action :check_api_writable, :only => [:create, :update, :destroy] before_action :set_locale before_action :authorize authorize_resource - before_action :offline_error, :only => [:create, :destroy, :data] - around_action :api_call_handle_error + before_action :offline_error, :only => [:create, :destroy] + skip_around_action :api_call_timeout, :only => :create def show @trace = Trace.visible.find(params[:id]) @@ -72,24 +71,6 @@ module Api end end - def data - trace = Trace.visible.find(params[:id]) - - if trace.public? || trace.user == current_user - if request.format == Mime[:xml] - send_data(trace.xml_file.read, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => "attachment") - elsif request.format == Mime[:gpx] - send_data(trace.xml_file.read, :filename => "#{trace.id}.gpx", :type => request.format.to_s, :disposition => "attachment") - elsif trace.file.attached? - redirect_to rails_blob_path(trace.file, :disposition => "attachment") - else - send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => "attachment") - end - else - head :forbidden - end - end - private def do_create(file, tags, description, visibility)