From: Tom Hughes Date: Tue, 15 Oct 2013 23:46:33 +0000 (+0100) Subject: Use gpx as the extension when we ask for /trace/N/data.gpx X-Git-Tag: live~4636 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3678e83678bef0c2f5ea2303e56db843096cb7a2?hp=d85fac567be1e2a64fe5737ce1673eca131680af Use gpx as the extension when we ask for /trace/N/data.gpx --- diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb index 790acce1d..9c4a9d8bd 100644 --- a/app/controllers/trace_controller.rb +++ b/app/controllers/trace_controller.rb @@ -151,8 +151,10 @@ class TraceController < ApplicationController if trace.visible? and (trace.public? or (@user and @user == trace.user)) if Acl.no_trace_download(request.remote_ip) render :text => "", :status => :forbidden - elsif request.format == Mime::XML or request.format == Mime::GPX + elsif request.format == Mime::XML send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => 'attachment') + elsif request.format == Mime::GPX + send_file(trace.xml_file, :filename => "#{trace.id}.gpx", :type => request.format.to_s, :disposition => 'attachment') else send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => 'attachment') end