X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6aca6cfabf21da48567e8197457dae8785b7324d..849e874dce46f798b4df68579d5a892ce11d52e8:/app/controllers/trace_controller.rb?ds=sidebyside

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index 7b2314be3..0725957bf 100644
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -16,12 +16,6 @@ class TraceController < ApplicationController
   before_filter :offline_redirect, :only => [:create, :edit, :delete, :data, :api_create, :api_delete, :api_data]
   around_filter :api_call_handle_error, :only => [:api_create, :api_read, :api_update, :api_delete, :api_data]
 
-  caches_action :list, :unless => :logged_in?, :layout => false
-  caches_action :view, :layout => false
-  caches_action :georss, :layout => true
-  cache_sweeper :trace_sweeper, :only => [:create, :edit, :delete, :api_create, :api_update, :api_delete]
-  cache_sweeper :tracetag_sweeper, :only => [:create, :edit, :delete, :api_create, :api_update, :api_delete]
-
   # 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
   def list
@@ -30,9 +24,7 @@ class TraceController < ApplicationController
     if !display_name.blank?
       target_user = User.active.where(:display_name => display_name).first
       if target_user.nil?
-        @title = t'trace.no_such_user.title'
-        @not_found_user = display_name
-        render :action => 'no_such_user', :status => :not_found
+        render_unknown_user display_name
         return
       end
     end
@@ -68,13 +60,7 @@ class TraceController < ApplicationController
     end
 
     if params[:tag]
-      @tag = params[:tag]
-
-      files = Tracetag.where(:tag => params[:tag]).select(:gpx_id).all
-
-      if files.length > 0
-        @traces = @traces.where(:id => files.collect { |tt| tt.gpx_id })
-      end
+      @traces = @traces.tagged(params[:tag])
     end
 
     @page = (params[:page] || 1).to_i
@@ -164,17 +150,17 @@ class TraceController < ApplicationController
 
     if trace.visible? and (trace.public? or (@user and @user == trace.user))
       if Acl.no_trace_download(request.remote_ip)
-        render :nothing => true, :status => :forbidden
+        render :text => "", :status => :forbidden
       elsif 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 => :not_found
+      render :text => "", :status => :not_found
     end
   rescue ActiveRecord::RecordNotFound
-    render :nothing => true, :status => :not_found
+    render :text => "", :status => :not_found
   end
 
   def edit
@@ -191,10 +177,10 @@ class TraceController < ApplicationController
         end
       end
     else
-      render :nothing => true, :status => :forbidden
+      render :text => "", :status => :forbidden
     end
   rescue ActiveRecord::RecordNotFound
-    render :nothing => true, :status => :not_found
+    render :text => "", :status => :not_found
   end
 
   def delete
@@ -207,24 +193,24 @@ class TraceController < ApplicationController
         flash[:notice] = t 'trace.delete.scheduled_for_deletion'
         redirect_to :action => :list, :display_name => @user.display_name
       else
-        render :nothing => true, :status => :not_found
+        render :text => "", :status => :not_found
       end
     else
-      render :nothing => true, :status => :forbidden
+      render :text => "", :status => :forbidden
     end
   rescue ActiveRecord::RecordNotFound
-    render :nothing => true, :status => :not_found
+    render :text => "", :status => :not_found
   end
 
   def georss
-    traces = Trace.public
+    traces = Trace.public.visible
 
     if params[:display_name]
       traces = traces.joins(:user).where(:users => {:display_name => params[:display_name]})
     end
 
     if params[:tag]
-      traces = traces.where("EXISTS (SELECT * FROM gpx_file_tags AS gft WHERE gft.gpx_id = gpx_files.id AND gft.tag = ?)", params[:tag])
+      traces = traces.tagged(params[:tag])
     end
 
     traces = traces.order("timestamp DESC")
@@ -248,13 +234,13 @@ class TraceController < ApplicationController
         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')
       else
-        render :nothing => true, :status => :forbidden
+        render :text => "", :status => :forbidden
       end
     else
-      render :nothing => true, :status => :not_found
+      render :text => "", :status => :not_found
     end
   rescue ActiveRecord::RecordNotFound
-    render :nothing => true, :status => :not_found
+    render :text => "", :status => :not_found
   end
 
   def icon
@@ -265,13 +251,13 @@ class TraceController < ApplicationController
         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')
       else
-        render :nothing => true, :status => :forbidden
+        render :text => "", :status => :forbidden
       end
     else
-      render :nothing => true, :status => :not_found
+      render :text => "", :status => :not_found
     end
   rescue ActiveRecord::RecordNotFound
-    render :nothing => true, :status => :not_found
+    render :text => "", :status => :not_found
   end
 
   def api_read
@@ -280,7 +266,7 @@ class TraceController < ApplicationController
     if trace.public? or trace.user == @user
       render :text => trace.to_xml.to_s, :content_type => "text/xml"
     else
-      render :nothing => true, :status => :forbidden
+      render :text => "", :status => :forbidden
     end
   end
 
@@ -299,9 +285,9 @@ class TraceController < ApplicationController
       trace.visibility = new_trace.visibility
       trace.save!
 
-      render :nothing => true, :status => :ok
+      render :text => "", :status => :ok
     else
-      render :nothing => true, :status => :forbidden
+      render :text => "", :status => :forbidden
     end
   end
 
@@ -312,9 +298,9 @@ class TraceController < ApplicationController
       trace.visible = false
       trace.save!
 
-      render :nothing => true, :status => :ok
+      render :text => "", :status => :ok
     else
-      render :nothing => true, :status => :forbidden
+      render :text => "", :status => :forbidden
     end
   end
 
@@ -328,7 +314,7 @@ class TraceController < ApplicationController
         send_file(trace.trace_name, :filename => "#{trace.id}#{trace.extension_name}", :type => trace.mime_type, :disposition => 'attachment')
       end
     else
-      render :nothing => true, :status => :forbidden
+      render :text => "", :status => :forbidden
     end
   end
 
@@ -351,12 +337,12 @@ class TraceController < ApplicationController
       if @trace.id
         render :text => @trace.id.to_s, :content_type => "text/plain"
       elsif @trace.valid?
-        render :nothing => true, :status => :internal_server_error
+        render :text => "", :status => :internal_server_error
       else
-        render :nothing => true, :status => :bad_request
+        render :text => "", :status => :bad_request
       end
     else
-      render :nothing => true, :status => :bad_request
+      render :text => "", :status => :bad_request
     end
   end
 
@@ -370,7 +356,7 @@ private
     filename = "/tmp/#{rand}"
 
     # ...and save the uploaded file to that location
-    File.open(filename, "w") { |f| f.write(file.read) }
+    File.open(filename, "wb") { |f| f.write(file.read) }
 
     # Create the trace object, falsely marked as already
     # inserted to stop the import daemon trying to load it