From d00a8dc2076b6283b513f82cb0626df36a89a343 Mon Sep 17 00:00:00 2001 From: Arthur Andersen Date: Wed, 16 Sep 2015 17:45:35 +0200 Subject: [PATCH] Add relations filter for non-or-closed or any-open --- app/models/issue_query.rb | 3 +++ app/models/query.rb | 8 +++++--- config/locales/en-GB.yml | 2 ++ config/locales/en.yml | 2 ++ public/javascripts/application.js | 2 ++ test/unit/query_test.rb | 28 ++++++++++++++++++++++++++++ 6 files changed, 42 insertions(+), 3 deletions(-) diff --git a/app/models/issue_query.rb b/app/models/issue_query.rb index e21ccf6..e589c6c 100644 --- a/app/models/issue_query.rb +++ b/app/models/issue_query.rb @@ -529,6 +529,9 @@ class IssueQuery < Query 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 "!|c", "*&o" + op = (operator == "!|c" ? '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] diff --git a/app/models/query.rb b/app/models/query.rb index a232258..8e4a6d5 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -201,7 +201,9 @@ class Query < ActiveRecord::Base "!~" => :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, + "!|c" => :label_none_or_closed_issues } class_attribute :operators_by_filter_type @@ -216,7 +218,7 @@ class Query < ActiveRecord::Base :text => [ "~", "!~", "!*", "*" ], :integer => [ "=", ">=", "<=", "><", "!*", "*" ], :float => [ "=", ">=", "<=", "><", "!*", "*" ], - :relation => ["=", "=p", "=!p", "!p", "!*", "*"], + :relation => ["=", "=p", "=!p", "!p", "*&o", "!|c", "!*", "*"], :tree => ["=", "~", "!*", "*"] } @@ -278,7 +280,7 @@ class Query < ActiveRecord::Base # 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", "!|c"].include? operator_for(field) end if filters end diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index c6cbe09..addbddc 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -1065,6 +1065,8 @@ en-GB: 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_none_or_closed_issues: none or closed issues label_any: all label_last_n_weeks: last %{count} weeks setting_cross_project_subtasks: Allow cross-project subtasks diff --git a/config/locales/en.yml b/config/locales/en.yml index d38b85d..ff8796e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -710,6 +710,8 @@ en: 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_none_or_closed_issues: none or closed issues label_day_plural: days label_repository: Repository label_repository_new: New repository diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 55883fc..fe1a0c1 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -275,6 +275,8 @@ function toggleOperator(field) { case "y": case "o": case "c": + case "!|c": + case "*&o": enableValues(field, []); break; case "><": diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb index aa45b5b..41368d3 100644 --- a/test/unit/query_test.rb +++ b/test/unit/query_test.rb @@ -845,6 +845,34 @@ class QueryTest < ActiveSupport::TestCase assert_not_include 3, ids end + def test_filter_on_relations_with_any_open_issues + IssueRelation.delete_all + # Issue 1 is blocked by 8, which is closed + IssueRelation.create!(:relation_type => "blocked", :issue_from => Issue.find(1), :issue_to => Issue.find(8)) + # Issue 2 is blocked by 3, which is open + IssueRelation.create!(:relation_type => "blocked", :issue_from => Issue.find(2), :issue_to => Issue.find(3)) + + query = IssueQuery.new(:name => '_') + query.filters = {"blocked" => {:operator => "*&o", :values => ['']}} + ids = find_issues_with_query(query).map(&:id) + assert_equal [], ids & [1] + assert_include 2, ids + end + + def test_filter_on_relations_with_none_or_closed_issues + IssueRelation.delete_all + # Issue 1 is blocked by 8, which is closed + IssueRelation.create!(:relation_type => "blocked", :issue_from => Issue.find(1), :issue_to => Issue.find(8)) + # Issue 2 is blocked by 3, which is open + IssueRelation.create!(:relation_type => "blocked", :issue_from => Issue.find(2), :issue_to => Issue.find(3)) + + query = IssueQuery.new(:name => '_') + query.filters = {"blocked" => {:operator => "!|c", :values => ['']}} + ids = find_issues_with_query(query).map(&:id) + assert_equal [], ids & [2] + assert_include 1, ids + end + def test_filter_on_relations_with_no_issues IssueRelation.delete_all IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(1), :issue_to => Issue.find(2)) -- 2.5.2