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

Merged 17047 from trunk.

Browse source
This commit is contained in:
Tom Hughes 2009-10-13 20:20:13 +00:00
commit 7b384f03ab
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/trace_controller.rb
View file

@ -46,15 +46,15 @@ class TraceController < ApplicationController
# 4 - user's traces, not logged in as that user = all user's public traces
if target_user.nil? # all traces
if @user
conditions = ["(gpx_files.visibility <> 'private' OR gpx_files.user_id = ?)", @user.id] #1
conditions = ["(gpx_files.visibility in ('public', 'identifiable') OR gpx_files.user_id = ?)", @user.id] #1
else
conditions = ["gpx_files.visibility <> 'private'"] #2
conditions = ["gpx_files.visibility in ('public', 'identifiable')"] #2
end
else
if @user and @user == target_user
conditions = ["gpx_files.user_id = ?", @user.id] #3 (check vs user id, so no join + can't pick up non-public traces by changing name)
else
conditions = ["gpx_files.public <> 'private' AND gpx_files.user_id = ?", target_user.id] #4
conditions = ["gpx_files.visibility in ('public', 'identifiable') AND gpx_files.user_id = ?", target_user.id] #4
end
end
@ -211,7 +211,7 @@ class TraceController < ApplicationController
end
def georss
conditions = ["gpx_files.visibility <> 'private'"]
conditions = ["gpx_files.visibility in ('public', 'identifiable')"]
if params[:display_name]
conditions[0] += " AND users.display_name = ?"