cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix trace lists to correctly respect tag restrictions

Browse source
This commit is contained in:
Tom Hughes 2013-05-10 22:32:14 +01:00
parent b3e540a6b6
commit a945fc0fcd
1 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/trace_controller.rb
View file

@ -66,13 +66,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
@ -222,7 +216,7 @@ class TraceController < ApplicationController
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")