| @@ -352,6 +352,7 class IssueQuery < Query | |||
|
|
352 | 352 | members_of_groups = groups.inject([]) {|user_ids, group| |
|
|
353 | 353 | if group && group.user_ids.present? |
|
|
354 | 354 | user_ids << group.user_ids |
|
|
355 | user_ids << group.id | |
|
|
355 | 356 | end |
|
|
356 | 357 | user_ids.flatten.uniq.compact |
|
|
357 | 358 | }.sort.collect(&:to_s) |
| @@ -1124,7 +1124,7 class QueryTest < ActiveSupport::TestCase | |||
|
|
1124 | 1124 | @query = IssueQuery.new(:name => '_') |
|
|
1125 | 1125 | @query.add_filter('member_of_group', '=', [@group.id.to_s]) |
|
|
1126 | 1126 | |
|
|
1127 | assert_query_statement_includes @query, "#{Issue.table_name}.assigned_to_id IN ('#{@user_in_group.id}','#{@second_user_in_group.id}')" | |
|
|
1127 | assert_query_statement_includes @query, "#{Issue.table_name}.assigned_to_id IN ('#{@user_in_group.id}','#{@second_user_in_group.id}','#{@group.id}')" | |
|
|
1128 | 1128 | assert_find_issues_with_query_is_successful @query |
|
|
1129 | 1129 | end |
|
|
1130 | 1130 | |
| @@ -1133,7 +1133,7 class QueryTest < ActiveSupport::TestCase | |||
|
|
1133 | 1133 | @query.add_filter('member_of_group', '!*', ['']) |
|
|
1134 | 1134 | |
|
|
1135 | 1135 | # Users not in a group |
|
|
1136 | 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}')" | |
|
|
1136 | 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}')" | |
|
|
1137 | 1137 | assert_find_issues_with_query_is_successful @query |
|
|
1138 | 1138 | end |
|
|
1139 | 1139 | |
| @@ -1142,7 +1142,7 class QueryTest < ActiveSupport::TestCase | |||
|
|
1142 | 1142 | @query.add_filter('member_of_group', '*', ['']) |
|
|
1143 | 1143 | |
|
|
1144 | 1144 | # Only users in a group |
|
|
1145 | 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}')" | |
|
|
1145 | 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}')" | |
|
|
1146 | 1146 | assert_find_issues_with_query_is_successful @query |
|
|
1147 | 1147 | end |
|
|
1148 | 1148 | |
General Comments 0
You need to be logged in to leave comments.
Login now