Merge 7922:8377 from trunk.

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

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index 7c5bd7db00df0d64b4561a170fe5bf749eba5723..0467e66bac49028fff5a56f21c4d84b55fe1e8ba 100644 (file)
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -1,7 +1,10 @@
 class TraceController < ApplicationController
 class TraceController < ApplicationController

+  layout 'site'
+

   before_filter :authorize_web  
   before_filter :authorize, :only => [:api_details, :api_data, :api_create]
   before_filter :authorize_web  
   before_filter :authorize, :only => [:api_details, :api_data, :api_create]

-  layout 'site'
+  before_filter :check_database_availability, :except => [:api_details, :api_data, :api_create]
+  before_filter :check_read_availability, :only => [:api_details, :api_data, :api_create]

  
   # Counts and selects pages of GPX traces for various criteria (by user, tags, public etc.).
   #  target_user - if set, specifies the user to fetch traces for.  if not set will fetch all traces
  
   # Counts and selects pages of GPX traces for various criteria (by user, tags, public etc.).
   #  target_user - if set, specifies the user to fetch traces for.  if not set will fetch all traces


@@ -83,14 +86,17 @@ class TraceController < ApplicationController
 
   def view
     @trace = Trace.find(params[:id])
 
   def view
     @trace = Trace.find(params[:id])

-    @title = "Viewing trace #{@trace.name}"
-    if !@trace.visible?
-      render :nothing => true, :status => :not_found
-    elsif !@trace.public? and @trace.user.id != @user.id
-      render :nothing => true, :status => :forbidden
+
+    if @trace and @trace.visible? and
+       (@trace.public? or @trace.user.id == @user.id)
+      @title = "Viewing trace #{@trace.name}"
+    else
+      flash[:notice] = "Trace not found!"
+      redirect_to :controller => 'trace', :action => 'list'

     end
   rescue ActiveRecord::RecordNotFound
     end
   rescue ActiveRecord::RecordNotFound

-    render :nothing => true, :status => :not_found
+    flash[:notice] = "Trace not found!"
+    redirect_to :controller => 'trace', :action => 'list'

   end
 
   def create
   end
 
   def create


@@ -121,7 +127,11 @@ class TraceController < ApplicationController
     trace = Trace.find(params[:id])
 
     if trace.visible? and (trace.public? or (@user and @user == trace.user))
     trace = Trace.find(params[:id])
 
     if trace.visible? and (trace.public? or (@user and @user == trace.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, :status => :not_found
     end
     else
       render :nothing, :status => :not_found
     end


@@ -192,7 +202,7 @@ class TraceController < ApplicationController
       conditions[0] += " AND users.display_name = ?"
       conditions << params[:display_name]
     end
       conditions[0] += " AND users.display_name = ?"
       conditions << params[:display_name]
     end

-    
+

     if params[:tag]
       conditions[0] += " AND EXISTS (SELECT * FROM gpx_file_tags AS gft WHERE gft.gpx_id = gpx_files.id AND gft.tag = ?)"
       conditions << params[:tag]
     if params[:tag]
       conditions[0] += " AND EXISTS (SELECT * FROM gpx_file_tags AS gft WHERE gft.gpx_id = gpx_files.id AND gft.tag = ?)"
       conditions << params[:tag]


@@ -297,7 +307,7 @@ private
     @trace.timestamp = Time.now
 
     if @trace.save
     @trace.timestamp = Time.now
 
     if @trace.save

-      File.rename(filename, @trace.trace_name)
+      FileUtils.mv(filename, @trace.trace_name)

     else
       FileUtils.rm_f(filename)
     end
     else
       FileUtils.rm_f(filename)
     end