tidier code

[rails.git] / app / controllers / trace_controller.rb

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index 64ecd5a7fa53e0ccaa81837eb1ecb06476e95a67..07a6fe21023b4c34c46cde7fa130bdaaa07d1b60 100644 (file)
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -117,7 +117,6 @@ class TraceController < ApplicationController
         end
 
         if @trace.id
         end
 
         if @trace.id

-          logger.info("id is #{@trace.id}")

           flash[:notice] = t "trace.create.trace_uploaded"
 
           if @user.traces.where(:inserted => false).count > 4
           flash[:notice] = t "trace.create.trace_uploaded"
 
           if @user.traces.where(:inserted => false).count > 4


@@ -219,7 +218,7 @@ class TraceController < ApplicationController
   def picture
     trace = Trace.find(params[:id])
 
   def picture
     trace = Trace.find(params[:id])
 

-    if trace.inserted?
+    if trace.visible? && trace.inserted?

       if trace.public? || (@user && @user == trace.user)
         expires_in 7.days, :private => !trace.public?, :public => trace.public?
         send_file(trace.large_picture_name, :filename => "#{trace.id}.gif", :type => "image/gif", :disposition => "inline")
       if trace.public? || (@user && @user == trace.user)
         expires_in 7.days, :private => !trace.public?, :public => trace.public?
         send_file(trace.large_picture_name, :filename => "#{trace.id}.gif", :type => "image/gif", :disposition => "inline")


@@ -236,7 +235,7 @@ class TraceController < ApplicationController
   def icon
     trace = Trace.find(params[:id])
 
   def icon
     trace = Trace.find(params[:id])
 

-    if trace.inserted?
+    if  trace.visible? && trace.inserted?

       if trace.public? || (@user && @user == trace.user)
         expires_in 7.days, :private => !trace.public?, :public => trace.public?
         send_file(trace.icon_picture_name, :filename => "#{trace.id}_icon.gif", :type => "image/gif", :disposition => "inline")
       if trace.public? || (@user && @user == trace.user)
         expires_in 7.days, :private => !trace.public?, :public => trace.public?
         send_file(trace.icon_picture_name, :filename => "#{trace.id}_icon.gif", :type => "image/gif", :disposition => "inline")


@@ -295,11 +294,13 @@ class TraceController < ApplicationController
   end
 
   def api_data
   end
 
   def api_data

-    trace = Trace.find(params[:id])
+    trace = Trace.visible.find(params[:id])

 
     if trace.public? || trace.user == @user
 
     if trace.public? || trace.user == @user

-      if request.format == Mime::XML || request.format == Mime::GPX
+      if request.format == Mime::XML

         send_file(trace.xml_file, :filename => "#{trace.id}.xml", :type => request.format.to_s, :disposition => "attachment")
         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
       else
         send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => "attachment")
       end