diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-01-29 17:59:20 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-01-29 17:59:20 +0000 |
| commit | 1e0a94de84197825e34c3dd01e5b2ef6112963d9 (patch) | |
| tree | 73ee0fed22faa5bc9c0849b02445e7e250d7a2c3 | |
| parent | 5851f55eeba77cb0dc037e724875ee93b6ac8c9f (diff) | |
| download | redmine-1e0a94de84197825e34c3dd01e5b2ef6112963d9.tar.gz redmine-1e0a94de84197825e34c3dd01e5b2ef6112963d9.zip | |
Fixe that filter "Assignee's group" doesn't work with group assignments (#13006).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11285 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/models/issue_query.rb | 1 | ||||
| -rw-r--r-- | test/unit/query_test.rb | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/models/issue_query.rb b/app/models/issue_query.rb index 5172f60d4..0fb184ea7 100644 --- a/app/models/issue_query.rb +++ b/app/models/issue_query.rb @@ -352,6 +352,7 @@ class IssueQuery < Query members_of_groups = groups.inject([]) {|user_ids, group| if group && group.user_ids.present? user_ids << group.user_ids + user_ids << group.id end user_ids.flatten.uniq.compact }.sort.collect(&:to_s) diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb index f728ed5c0..49e5cfc22 100644 --- a/test/unit/query_test.rb +++ b/test/unit/query_test.rb @@ -1124,7 +1124,7 @@ class QueryTest < ActiveSupport::TestCase @query = IssueQuery.new(:name => '_') @query.add_filter('member_of_group', '=', [@group.id.to_s]) - assert_query_statement_includes @query, "#{Issue.table_name}.assigned_to_id IN ('#{@user_in_group.id}','#{@second_user_in_group.id}')" + assert_query_statement_includes @query, "#{Issue.table_name}.assigned_to_id IN ('#{@user_in_group.id}','#{@second_user_in_group.id}','#{@group.id}')" assert_find_issues_with_query_is_successful @query end @@ -1133,7 +1133,7 @@ class QueryTest < ActiveSupport::TestCase @query.add_filter('member_of_group', '!*', ['']) # Users not in a group - assert_query_statement_includes @query, "#{Issue.table_name}.assigned_to_id IS NULL OR #{Issue.table_name}.assigned_to_id NOT IN ('#{@user_in_group.id}','#{@second_user_in_group.id}','#{@user_in_group2.id}')" + assert_query_statement_includes @query, "#{Issue.table_name}.assigned_to_id IS NULL OR #{Issue.table_name}.assigned_to_id NOT IN ('#{@user_in_group.id}','#{@second_user_in_group.id}','#{@user_in_group2.id}','#{@group.id}','#{@group2.id}')" assert_find_issues_with_query_is_successful @query end @@ -1142,7 +1142,7 @@ class QueryTest < ActiveSupport::TestCase @query.add_filter('member_of_group', '*', ['']) # Only users in a group - assert_query_statement_includes @query, "#{Issue.table_name}.assigned_to_id IN ('#{@user_in_group.id}','#{@second_user_in_group.id}','#{@user_in_group2.id}')" + assert_query_statement_includes @query, "#{Issue.table_name}.assigned_to_id IN ('#{@user_in_group.id}','#{@second_user_in_group.id}','#{@user_in_group2.id}','#{@group.id}','#{@group2.id}')" assert_find_issues_with_query_is_successful @query end |