X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/289ab7c19d3fbce8639282ae6c9611374ec43760..2ce394118da72186ed0ca4594c1833c3579bb2a6:/app/controllers/trace_controller.rb?ds=sidebyside diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb index b19e4d8b6..1a75ac4cc 100644 --- a/app/controllers/trace_controller.rb +++ b/app/controllers/trace_controller.rb @@ -206,7 +206,7 @@ class TraceController < ApplicationController trace.visible = false trace.save flash[:notice] = t 'trace.delete.scheduled_for_deletion' - redirect_to :action => :mine, :display_name => @user.display_name + redirect_to :action => :list, :display_name => @user.display_name else render :nothing => true, :status => :bad_request end @@ -292,7 +292,11 @@ class TraceController < ApplicationController trace = Trace.find(params[:id]) if trace.public? or trace.user == @user - send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => 'attachment') + if request.format == Mime::XML + send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => Mime::XML.to_s, :disposition => 'attachment') + else + send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => 'attachment') + end else render :nothing => true, :status => :forbidden end