Optimize retrieval of user's projects members.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3607 e93f8b46-1217-0410-a6f0-8f06a7374b81

Optimize retrieval of user's projects members.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3607 e93f8b46-1217-0410-a6f0-8f06a7374b81
5225fb70 · Jean-Philippe Lang · e584ae22 · 5225fb70
Commit 5225fb70 authored Mar 21, 2010 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

query.rb app/models/query.rb +5 -3

No files found.
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -185,9 +185,11 @@ class Query < ActiveRecord::Base
    if project
      user_values += project.users.sort.collect{|s| [s.name, s.id.to_s] }
    else
-      # members of the user's projects
-      # OPTIMIZE: Is selecting from users per project (N+1)
-      user_values += User.current.projects.collect(&:users).flatten.uniq.sort.collect{|s| [s.name, s.id.to_s] }
+      project_ids = User.current.projects.collect(&:id)
+      if project_ids.any?
+        # members of the user's projects
+        user_values += User.active.find(:all, :conditions => ["#{User.table_name}.id IN (SELECT DISTINCT user_id FROM members WHERE project_id IN (?))", project_ids]).sort.collect{|s| [s.name, s.id.to_s] }
+      end
    end
    @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => user_values } unless user_values.empty?
    @available_filters["author_id"] = { :type => :list, :order => 5, :values => user_values } unless user_values.empty?