Convert friend changeset selection to use Arel queries

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

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 09dabc956fbbbfe1086c04552515cbb5d63f40ce..941c54d499fd27e5b00bb95745def51d9dd83a5f 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -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