Merge branch 'master' into openstreetbugs

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

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 033d89e4e45302f08e2e5c782798f5b36447b66a..b736e332b04431d3e6e0cc1cb76484c406fd313f 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -268,23 +268,11 @@ 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
+          require_user
+          return
         end
       end
 
@@ -303,7 +291,7 @@ class ChangesetController < ApplicationController
         user_link = render_to_string :partial => "user", :object => user
       end
       
-      if params[:friends] and user
+      if params[:friends] and @user
         @title =  t 'changeset.list.title_friend'
         @heading =  t 'changeset.list.heading_friend'
         @description = t 'changeset.list.description_friend'