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

Convert friend changeset selection to use Arel queries

Browse source
This commit is contained in:
Tom Hughes 2011-12-15 21:47:43 +00:00
parent 9d94d41376
commit 78db9e72bb
2 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/controllers/changeset_controller.rb
View file

@ -268,20 +268,8 @@ class ChangesetController < ApplicationController
end
if params[:friends]
user = @user
if user
friend_ids = []
user.friends.each do |friend|
friend_user = User.find(friend.friend_user_id)
if friend_user.data_public?
friend_ids << friend.friend_user_id
end
end
if friend_ids.length > 0
conditions = cond_merge conditions, ['user_id in (?)', friend_ids]
else
conditions = cond_merge conditions, ['false']
end
if @user
changesets = changesets.where(:user_id => @user.friend_users.public)
elsif request.format == :html
@title = t 'user.no_such_user.title'
render :template => 'user/no_such_user', :status => :not_found