jro_apps/redmine Commit - r10348:b9d7c2229720

Adds no_issue_in_project operator for relations filter (#3265)....

Jean-Philippe Lang -

r10348:b9d7c2229720

parent child

Context file:

r10348:b9d7c2229720

Collapse all files

app/models/query.rb +8 -6

                               "~"   => :label_contains,
                               "!~"  => :label_not_contains,
                               "=p"  => :label_any_issues_in_project,
-                              "=!p" => :label_any_issues_not_in_project}
+                              "=!p" => :label_any_issues_not_in_project,
+                              "!p"  => :label_no_issues_in_project}
               cattr_reader :operators
                                              :text => [  "~", "!~", "!*", "*" ],
                                              :integer => [ "=", ">=", "<=", "><", "!*", "*" ],
                                              :float => [ "=", ">=", "<=", "><", "!*", "*" ],
-                                             :relation => ["=", "=p", "=!p", "!*", "*"]}
+                                             :relation => ["=", "=p", "=!p", "!p", "!*", "*"]}
               cattr_reader :operators_by_filter_type
                   when "=", "!"
                     op = (operator == "=" ? 'IN' : 'NOT IN')
                     "#{Issue.table_name}.id #{op} (SELECT DISTINCT #{IssueRelation.table_name}.#{join_column} FROM #{IssueRelation.table_name} WHERE #{IssueRelation.table_name}.relation_type = '#{connection.quote_string(relation_type)}' AND #{IssueRelation.table_name}.#{target_join_column} = #{value.first.to_i})"
-                  when "=p", "=!p"
+                  when "=p", "=!p", "!p"
-                    op = (operator == "=p" ? '=' : '<>')
+                    op = (operator == "!p" ? 'NOT IN' : 'IN')
-                    "#{Issue.table_name}.id IN (SELECT DISTINCT #{IssueRelation.table_name}.#{join_column} FROM #{IssueRelation.table_name}, #{Issue.table_name} relissues WHERE #{IssueRelation.table_name}.relation_type = '#{connection.quote_string(relation_type)}' AND #{IssueRelation.table_name}.#{target_join_column} = relissues.id AND relissues.project_id #{op} #{value.first.to_i})"
+                    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 = '#{connection.quote_string(relation_type)}' AND #{IssueRelation.table_name}.#{target_join_column} = relissues.id AND relissues.project_id #{comp} #{value.first.to_i})"
                   end
                 if relation_options[:sym] == field && !options[:reverse]
                   sqls = [sql, sql_for_relations(field, operator, value, :reverse => true)]
-                  sqls.join(["!", "!*"].include?(operator) ? " AND " : " OR ")
+                  sqls.join(["!", "!*", "!p"].include?(operator) ? " AND " : " OR ")
                 else
                   sql
                 end

config/locales/en.yml +1 0

               label_not_contains: doesn't contain
               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_day_plural: days
               label_repository: Repository
               label_repository_new: New repository

config/locales/fr.yml +1 0

               label_not_contains: ne contient pas
               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_day_plural: jours
               label_repository: Dépôt
               label_repository_new: Nouveau dépôt

public/javascripts/application.js +1 0

                   break;
                 case "=p":
                 case "=!p":
+                case "!p":
                   enableValues(field, [1]);
                   break;
                 default:

test/unit/query_test.rb +16 0

@@ -672,6 +672,22 class QueryTest < ActiveSupport::TestCase
672	assert_equal [1], find_issues_with_query(query).map(&:id).sort	672	assert_equal [1], find_issues_with_query(query).map(&:id).sort
673	end	673	end
674		674
		675	def test_filter_on_relations_with_no_issues_in_a_project
		676	IssueRelation.delete_all
		677	with_settings :cross_project_issue_relations => '1' do
		678	IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(1), :issue_to => Project.find(2).issues.first)
		679	IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(2), :issue_to => Project.find(3).issues.first)
		680	IssueRelation.create!(:relation_type => "relates", :issue_to => Project.find(2).issues.first, :issue_from => Issue.find(3))
		681	end
		682
		683	query = Query.new(:name => '_')
		684	query.filters = {"relates" => {:operator => '!p', :values => ['2']}}
		685	ids = find_issues_with_query(query).map(&:id).sort
		686	assert_include 2, ids
		687	assert_not_include 1, ids
		688	assert_not_include 3, ids
		689	end
		690
675	def test_filter_on_relations_with_no_issues	691	def test_filter_on_relations_with_no_issues
676	IssueRelation.delete_all	692	IssueRelation.delete_all
677	IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(1), :issue_to => Issue.find(2))	693	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