jro_apps/redmine Commit - r13127:2d64a22dd928

Makes Project#assignable_users return a scope that prevents 2*n queries....

Jean-Philippe Lang -

r13127:2d64a22dd928

parent child

Context file:

r13127:2d64a22dd928

app/models/issue.rb +1 -1

               # Users the issue can be assigned to
               def assignable_users
-                users = project.assignable_users
+                users = project.assignable_users.to_a
                 users << author if author
                 users << assigned_to if assigned_to
                 users.uniq.sort

app/models/project.rb +7 -5

                 Member.delete_all(['project_id = ?', id])
               end
-              # Users/groups issues can be assigned to
+              # Return a Principal scope of users/groups issues can be assigned to
               def assignable_users
                 types = ['User']
                 types << 'Group' if Setting.issue_group_assignment?
-                member_principals.
+                @assignable_users ||= Principal.
-                  select {|m| types.include?(m.principal.type) && m.roles.detect(&:assignable?)}.
+                  active.
-                  map(&:principal).
+                  joins(:members => :roles).
-                  sort
+                  where(:type => types, :members => {:project_id => id}, :roles => {:assignable => true}).
+                  uniq.
+                  sorted
               end
               # Returns the mail addresses of users that should be always notified on project events

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages