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

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8747 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2012-02-01 20:07:01 +00:00
parent 0154d7477b
commit 2808adf99f
4 changed files with 38 additions and 7 deletions
+5
View File
@@ -27,6 +27,11 @@ class PrincipalTest < ActiveSupport::TestCase
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')
+13
View File
@@ -766,6 +766,19 @@ class QueryTest < ActiveSupport::TestCase
assert users[:values].map{|u|u[1]}.include?("3")
end
should "include users of subprojects" do
user1 = User.generate_with_protected!
user2 = User.generate_with_protected!
project = Project.find(1)
Member.create!(:principal => user1, :project => project.children.visible.first, :role_ids => [1])
@query.project = project
users = @query.available_filters["assigned_to_id"]
assert_not_nil users
assert users[:values].map{|u|u[1]}.include?(user1.id.to_s)
assert !users[:values].map{|u|u[1]}.include?(user2.id.to_s)
end
should "include visible projects in cross-project view" do
projects = @query.available_filters["project_id"]
assert_not_nil projects