X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/4434bac3b484006d579b9229a5f69b182644eae7..a9e1c229d23000dbf91571b7aafc4cf19ac6f1d6:/app/controllers/trace_controller.rb

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index c3ddb5f2d..3614dadde 100644
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -113,7 +113,25 @@ class TraceController < ApplicationController
       flash[:notice] = "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
       redirect_to :action => 'mine'
     else
-#      render :action => 'mine'
+      # fixme throw an error here
+      # render :action => 'mine'
+    end
+  end
+
+  def data
+    trace = Trace.find(params[:id])
+    if trace.public? or (@user and @user == trace.user)
+      send_data(File.open("/tmp/#{trace.id}.gpx",'r').read , :filename => "#{trace.id}.gpx", :type => 'text/plain', :disposition => 'inline')
+    end
+  end
+
+  def make_public
+    trace = Trace.find(params[:id])
+    if @user and trace.user == @user and !trace.public
+      trace.public = true
+      trace.save
+      flash[:notice] = 'Track made public'
+      redirect_to :controller => 'trace', :action => 'view', :id => params[:id]
     end
   end
 
@@ -134,11 +152,11 @@ class TraceController < ApplicationController
 
   def picture
     trace = Trace.find(params[:id])
-    send_data(trace.large_picture, :filename => "#{trace.id}.gif", :type => 'image/gif', :disposition => 'inline') if trace.public
+    send_data(trace.large_picture, :filename => "#{trace.id}.gif", :type => 'image/gif', :disposition => 'inline') if trace.public? or (@user and @user == trace.user)
   end
 
   def icon
     trace = Trace.find(params[:id])
-    send_data(trace.icon_picture, :filename => "#{trace.id}_icon.gif", :type => 'image/gif', :disposition => 'inline') if trace.public
+    send_data(trace.icon_picture, :filename => "#{trace.id}_icon.gif", :type => 'image/gif', :disposition => 'inline') if trace.public? or (@user and @user == trace.user)
   end
 end