jro_apps/redmine Commit - r8627:2808adf99f44

Adds members of subprojects in assignee and author filters (#10126)....

Jean-Philippe Lang -

r8627:2808adf99f44

parent child

Context file:

r8627:2808adf99f44

Collapse all files

app/models/principal.rb +10 0

@@ -33,6 +33,16 class Principal < ActiveRecord::Base
33	}	33	}
34	}	34	}
35		35
		36	# Principals that are members of a collection of projects
		37	named_scope :member_of, lambda {\|projects\|
		38	if projects.empty?
		39	{:conditions => "1=0"}
		40	else
		41	ids = projects.map(&:id)
		42	{:conditions => ["#{Principal.table_name}.status = 1 AND #{Principal.table_name}.id IN (SELECT DISTINCT user_id FROM #{Member.table_name} WHERE project_id IN (?))", ids]}
		43	end
		44	}
		45
36	before_create :set_default_empty_values	46	before_create :set_default_empty_values
37		47
38	def name(formatter = nil)	48	def name(formatter = nil)

app/models/query.rb +10 -7

                 principals = []
                 if project
                   principals += project.principals.sort
+                  unless project.leaf?
+                    subprojects = project.descendants.visible.all
+                    if subprojects.any?
+                      @available_filters["subproject_id"] = { :type => :list_subprojects, :order => 13, :values => subprojects.collect{|s| [s.name, s.id.to_s] } }
+                      principals += Principal.member_of(subprojects)
+                    end
+                  end
                 else
                   all_projects = Project.visible.all
                   if all_projects.any?
                     # members of visible projects
-                    principals += Principal.active.find(:all, :conditions => ["#{User.table_name}.id IN (SELECT DISTINCT user_id FROM members WHERE project_id IN (?))", all_projects.collect(&:id)]).sort
+                    principals += Principal.member_of(all_projects)
                     # project filter
                     project_values = []
                     @available_filters["project_id"] = { :type => :list, :order => 1, :values => project_values} unless project_values.empty?
                   end
                 end
+                principals.uniq!
+                principals.sort!
                 users = principals.select {|p| p.is_a?(User)}
                 assigned_to_values = []
                   unless versions.empty?
                     @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => versions.sort.collect{|s| ["#{s.project.name} - #{s.name}", s.id.to_s] } }
                   end
-                  unless project.leaf?
-                    subprojects = project.descendants.visible.all
-                    unless subprojects.empty?
-                      @available_filters["subproject_id"] = { :type => :list_subprojects, :order => 13, :values => subprojects.collect{|s| [s.name, s.id.to_s] } }
-                    end
-                  end
                   add_custom_fields_filters(project.all_issue_custom_fields)
                 else
                   # global filters for cross project issue list

test/unit/principal_test.rb +5 0

                 assert_nil result.detect {|p| p.is_a?(AnonymousUser)}
               end
+              def test_member_of_scope_should_return_the_union_of_all_members
+                projects = Project.find_all_by_id(1, 2)
+                assert_equal projects.map(&:principals).flatten.sort, Principal.member_of(projects).sort
+              end
               context "#like" do
                 setup do
                   Principal.generate!(:login => 'login')

test/unit/query_test.rb +13 0

@@ -766,6 +766,19 class QueryTest < ActiveSupport::TestCase
766	assert users[:values].map{\|u\|u[1]}.include?("3")	766	assert users[:values].map{\|u\|u[1]}.include?("3")
767	end	767	end
768		768
		769	should "include users of subprojects" do
		770	user1 = User.generate_with_protected!
		771	user2 = User.generate_with_protected!
		772	project = Project.find(1)
		773	Member.create!(:principal => user1, :project => project.children.visible.first, :role_ids => [1])
		774	@query.project = project
		775
		776	users = @query.available_filters["assigned_to_id"]
		777	assert_not_nil users
		778	assert users[:values].map{\|u\|u[1]}.include?(user1.id.to_s)
		779	assert !users[:values].map{\|u\|u[1]}.include?(user2.id.to_s)
		780	end
		781
769	should "include visible projects in cross-project view" do	782	should "include visible projects in cross-project view" do
770	projects = @query.available_filters["project_id"]	783	projects = @query.available_filters["project_id"]
771	assert_not_nil projects	784	assert_not_nil projects

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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