jro_apps/redmine Commit - r14427:d3d7678c7689

Ability to filter issues blocked by any/no open issues (#16621)....

Jean-Philippe Lang -

r14427:d3d7678c7689

parent child

Context file:

r14427:d3d7678c7689

Collapse all files

app/models/issue_query.rb +3 0

                     op = (operator == "!p" ? 'NOT IN' : 'IN')
                     comp = (operator == "=!p" ? '<>' : '=')
                     "#{Issue.table_name}.id #{op} (SELECT DISTINCT #{IssueRelation.table_name}.#{join_column} FROM #{IssueRelation.table_name}, #{Issue.table_name} relissues WHERE #{IssueRelation.table_name}.relation_type = '#{self.class.connection.quote_string(relation_type)}' AND #{IssueRelation.table_name}.#{target_join_column} = relissues.id AND relissues.project_id #{comp} #{value.first.to_i})"
+                  when "*o", "!o"
+                    op = (operator == "!o" ? 'NOT IN' : 'IN')
+                    "#{Issue.table_name}.id #{op} (SELECT DISTINCT #{IssueRelation.table_name}.#{join_column} FROM #{IssueRelation.table_name}, #{Issue.table_name} relissues WHERE #{IssueRelation.table_name}.relation_type = '#{self.class.connection.quote_string(relation_type)}' AND #{IssueRelation.table_name}.#{target_join_column} = relissues.id AND relissues.status_id IN (SELECT id FROM #{IssueStatus.table_name} WHERE is_closed=#{self.class.connection.quoted_false}))"
                   end
                 if relation_options[:sym] == field && !options[:reverse]

app/models/query.rb +5 -3

                 "!~"  => :label_not_contains,
                 "=p"  => :label_any_issues_in_project,
                 "=!p" => :label_any_issues_not_in_project,
-                "!p"  => :label_no_issues_in_project
+                "!p"  => :label_no_issues_in_project,
+                "*o"  => :label_any_open_issues,
+                "!o"  => :label_no_open_issues
               }
               class_attribute :operators_by_filter_type
                 :text => [  "~", "!~", "!*", "*" ],
                 :integer => [ "=", ">=", "<=", "><", "!*", "*" ],
                 :float => [ "=", ">=", "<=", "><", "!*", "*" ],
-                :relation => ["=", "=p", "=!p", "!p", "!*", "*"],
+                :relation => ["=", "=p", "=!p", "!p", "*o", "!o", "!*", "*"],
                 :tree => ["=", "~", "!*", "*"]
               }
                       # filter requires one or more values
                       (values_for(field) and !values_for(field).first.blank?) or
                       # filter doesn't require any value
-                      ["o", "c", "!*", "*", "t", "ld", "w", "lw", "l2w", "m", "lm", "y"].include? operator_for(field)
+                      ["o", "c", "!*", "*", "t", "ld", "w", "lw", "l2w", "m", "lm", "y", "*o", "!o"].include? operator_for(field)
                 end if filters
               end

config/locales/en-GB.yml +2 0

               permission_view_private_notes: View private notes
               permission_set_notes_private: Set notes as private
               label_no_issues_in_project: no issues in project
+              label_any_open_issues: any open issues
+              label_no_open_issues: no open issues
               label_any: all
               label_last_n_weeks: last %{count} weeks
               setting_cross_project_subtasks: Allow cross-project subtasks

config/locales/en.yml +2 0

               label_any_issues_in_project: any issues in project
               label_any_issues_not_in_project: any issues not in project
               label_no_issues_in_project: no issues in project
+              label_any_open_issues: any open issues
+              label_no_open_issues: no open issues
               label_day_plural: days
               label_repository: Repository
               label_repository_new: New repository

config/locales/fr.yml +2 0

               label_any_issues_in_project: une demande du projet
               label_any_issues_not_in_project: une demande hors du projet
               label_no_issues_in_project: aucune demande du projet
+              label_any_open_issues: une demande ouverte
+              label_no_open_issues: aucune demande ouverte
               label_day_plural: jours
               label_repository: Dépôt
               label_repository_new: Nouveau dépôt

public/javascripts/application.js +2 0

                 case "y":
                 case "o":
                 case "c":
+                case "*o":
+                case "!o":
                   enableValues(field, []);
                   break;
                 case "><":

test/unit/query_test.rb +28 0

@@ -846,6 +846,34 class QueryTest < ActiveSupport::TestCase
846	assert_not_include 3, ids	846	assert_not_include 3, ids
847	end	847	end
848		848
		849	def test_filter_on_relations_with_any_open_issues
		850	IssueRelation.delete_all
		851	# Issue 1 is blocked by 8, which is closed
		852	IssueRelation.create!(:relation_type => "blocked", :issue_from => Issue.find(1), :issue_to => Issue.find(8))
		853	# Issue 2 is blocked by 3, which is open
		854	IssueRelation.create!(:relation_type => "blocked", :issue_from => Issue.find(2), :issue_to => Issue.find(3))
		855
		856	query = IssueQuery.new(:name => '_')
		857	query.filters = {"blocked" => {:operator => "*o", :values => ['']}}
		858	ids = find_issues_with_query(query).map(&:id)
		859	assert_equal [], ids & [1]
		860	assert_include 2, ids
		861	end
		862
		863	def test_filter_on_relations_with_no_open_issues
		864	IssueRelation.delete_all
		865	# Issue 1 is blocked by 8, which is closed
		866	IssueRelation.create!(:relation_type => "blocked", :issue_from => Issue.find(1), :issue_to => Issue.find(8))
		867	# Issue 2 is blocked by 3, which is open
		868	IssueRelation.create!(:relation_type => "blocked", :issue_from => Issue.find(2), :issue_to => Issue.find(3))
		869
		870	query = IssueQuery.new(:name => '_')
		871	query.filters = {"blocked" => {:operator => "!o", :values => ['']}}
		872	ids = find_issues_with_query(query).map(&:id)
		873	assert_equal [], ids & [2]
		874	assert_include 1, ids
		875	end
		876
849	def test_filter_on_relations_with_no_issues	877	def test_filter_on_relations_with_no_issues
850	IssueRelation.delete_all	878	IssueRelation.delete_all
851	IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(1), :issue_to => Issue.find(2))	879	IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(1), :issue_to => Issue.find(2))

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