Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-13 08:46:01 +01:00
Code Issues Packages Projects Releases Activity

Add support for "start with" and "end with" operators to "Files" filter (#31879).

Browse Source 
Patch by Yuichi HARADA.


git-svn-id: http://svn.redmine.org/redmine/trunk@18570 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2019-09-30 13:15:45 +00:00
parent c4df67dcaf
commit b0f1175e3e
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/issue_query.rb
View File

@@ -526,6 +526,9 @@ class IssueQuery < Query
c = sql_contains("a.filename", value.first) c = sql_contains("a.filename", value.first)
e = (operator == "~" ? "EXISTS" : "NOT EXISTS") e = (operator == "~" ? "EXISTS" : "NOT EXISTS")
"#{e} (SELECT 1 FROM #{Attachment.table_name} a WHERE a.container_type = 'Issue' AND a.container_id = #{Issue.table_name}.id AND #{c})" "#{e} (SELECT 1 FROM #{Attachment.table_name} a WHERE a.container_type = 'Issue' AND a.container_id = #{Issue.table_name}.id AND #{c})"
when "^", "$"
c = sql_contains("a.filename", value.first, (operator == "^" ? :starts_with : :ends_with) => true)
"EXISTS (SELECT 1 FROM #{Attachment.table_name} a WHERE a.container_type = 'Issue' AND a.container_id = #{Issue.table_name}.id AND #{c})"
end end
end end

14
test/unit/query_test.rb
View File

@@ -1353,6 +1353,20 @@ class QueryTest < ActiveSupport::TestCase
assert_nil issues.detect {|issue| issue.attachments.any? {|attachment| attachment.filename.include?('error281')}} assert_nil issues.detect {|issue| issue.attachments.any? {|attachment| attachment.filename.include?('error281')}}
end end
def test_filter_on_attachment_when_starts_with
query = IssueQuery.new(:name => '_')
query.filters = {"attachment" => {:operator => '^', :values => ['testfile']}}
issues = find_issues_with_query(query)
assert_equal [14], issues.collect(&:id).sort
end
def test_filter_on_attachment_when_ends_with
query = IssueQuery.new(:name => '_')
query.filters = {"attachment" => {:operator => '$', :values => ['zip']}}
issues = find_issues_with_query(query)
assert_equal [3, 4], issues.collect(&:id).sort
end
def test_filter_on_subject_when_starts_with def test_filter_on_subject_when_starts_with
query = IssueQuery.new(:name => '_') query = IssueQuery.new(:name => '_')
query.filters = {'subject' => {:operator => '^', :values => ['issue']}} query.filters = {'subject' => {:operator => '^', :values => ['issue']}}