jro_apps/redmine Commit - r15814:e808c6225323

Filtering out specific subprojects (using 'is not' operator) (#15773)....

Jean-Philippe Lang -

r15814:e808c6225323

parent child

Context file:

r15814:e808c6225323

Collapse all files

app/models/query.rb +10 -3

                 :list => [ "=", "!" ],
                 :list_status => [ "o", "=", "!", "c", "*" ],
                 :list_optional => [ "=", "!", "!*", "*" ],
-                :list_subprojects => [ "*", "!*", "=" ],
+                :list_subprojects => [ "*", "!*", "=", "!" ],
                 :date => [ "=", ">=", "<=", "><", "<t+", ">t+", "><t+", "t+", "t", "ld", "w", "lw", "l2w", "m", "lm", "y", ">t-", "<t-", "><t-", "t-", "!*", "*" ],
                 :date_past => [ "=", ">=", "<=", "><", ">t-", "<t-", "><t-", "t-", "t", "ld", "w", "lw", "l2w", "m", "lm", "y", "!*", "*" ],
                 :string => [ "=", "~", "!", "!~", "!*", "*" ],
               def project_statement
                 project_clauses = []
-                if project && !project.descendants.active.empty?
+                active_subprojects_ids = []
+                active_subprojects_ids = project.descendants.active.map(&:id) if project
+                if active_subprojects_ids.any?
                   if has_filter?("subproject_id")
                     case operator_for("subproject_id")
                     when '='
                       # include the selected subprojects
-                      ids = [project.id] + values_for("subproject_id").each(&:to_i)
+                      ids = [project.id] + values_for("subproject_id").map(&:to_i)
+                      project_clauses << "#{Project.table_name}.id IN (%s)" % ids.join(',')
+                    when '!'
+                      # exclude the selected subprojects
+                      ids = [project.id] + active_subprojects_ids - values_for("subproject_id").map(&:to_i)
                       project_clauses << "#{Project.table_name}.id IN (%s)" % ids.join(',')
                     when '!*'
                       # main project only

test/unit/query_test.rb +20 -3

                 Member.create!(:project_id => 1, :principal => other_group, :role_ids => [1])
                 User.current = user
                 with_settings :issue_group_assignment => '1' do
                   i1 = Issue.generate!(:project_id => 1, :tracker_id => 1, :assigned_to => user)
                   i2 = Issue.generate!(:project_id => 1, :tracker_id => 1, :assigned_to => group)
                   i3 = Issue.generate!(:project_id => 1, :tracker_id => 1, :assigned_to => other_group)
                   query = IssueQuery.new(:name => '_', :filters => { 'assigned_to_id' => {:operator => '=', :values => ['me']}})
                   result = query.issues
                   assert_equal Issue.visible.where(:assigned_to_id => ([2] + user.reload.group_ids)).sort_by(&:id), result.sort_by(&:id)
                   assert result.include?(i1)
                   assert result.include?(i2)
                   assert !result.include?(i3)
                 ActiveRecord::Base.default_timezone = :local # restore Redmine default
               end
+              def test_filter_on_subprojects
+                query = IssueQuery.new(:name => '_', :project => Project.find(1))
+                filter_name = "subproject_id"
+                assert_include filter_name, query.available_filters.keys
+                # "is" operator should include issues of parent project + issues of the selected subproject
+                query.filters = {filter_name => {:operator => '=', :values => ['3']}}
+                issues = find_issues_with_query(query)
+                assert_equal [1, 2, 3, 5, 7, 8, 11, 12, 13, 14], issues.map(&:id).sort
+                # "is not" operator should include issues of parent project + issues of all active subprojects - issues of the selected subprojects
+                query = IssueQuery.new(:name => '_', :project => Project.find(1))
+                query.filters = {filter_name => {:operator => '!', :values => ['3']}}
+                issues = find_issues_with_query(query)
+                assert_equal [1, 2, 3, 6, 7, 8, 9, 10, 11, 12], issues.map(&:id).sort
+              end
             end

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