Patch #43917 » 0001-Add-default-any_searchable-filter.patch
| app/models/issue_query.rb | ||
|---|---|---|
|
def initialize(attributes=nil, *args)
|
||
|
super(attributes)
|
||
|
self.filters ||= {'status_id' => {:operator => "o", :values => [""]}}
|
||
|
self.filters ||= {
|
||
|
'status_id' => {:operator => "o", :values => [""]},
|
||
|
'any_searchable' => {:operator => "~", :values => [""]}
|
||
|
}
|
||
|
end
|
||
|
def draw_relations
|
||
| app/models/query.rb | ||
|---|---|---|
|
:tree => ["=", "~", "!*", "*"]
|
||
|
}
|
||
|
NO_VALUE_REQUIRED_OPERATORS = %w[o c !* * nd t ld nw w lw l2w nm m lm y *o !o].freeze
|
||
|
class_attribute :available_columns
|
||
|
self.available_columns = []
|
||
| ... | ... | |
|
# filter requires one or more values
|
||
|
(values_for(field) and values_for(field).first.present?) or
|
||
|
# filter doesn't require any value
|
||
|
["o", "c", "!*", "*", "nd", "t", "ld", "nw", "w", "lw", "l2w", "nm", "m", "lm", "y", "*o", "!o"].include? operator_for(field)
|
||
|
NO_VALUE_REQUIRED_OPERATORS.include?(operator_for(field)) or
|
||
|
# filter with blank value is skipped only for :search filters
|
||
|
skip_filter_for_blank_value?(field, operator_for(field), values_for(field))
|
||
|
end if filters
|
||
|
end
|
||
| ... | ... | |
|
next unless v and !v.empty?
|
||
|
operator = operator_for(field)
|
||
|
next if skip_filter_for_blank_value?(field, operator, v)
|
||
|
# "me" value substitution
|
||
|
if %w(assigned_to_id author_id user_id watcher_id updated_by last_updated_by).include?(field)
|
||
| ... | ... | |
|
private
|
||
|
def skip_filter_for_blank_value?(field, operator, values)
|
||
|
return false unless type_for(field) == :search
|
||
|
return false if NO_VALUE_REQUIRED_OPERATORS.include?(operator)
|
||
|
values = Array(values)
|
||
|
values.none?(&:present?)
|
||
|
end
|
||
|
def grouped_query(&)
|
||
|
r = nil
|
||
|
if grouped?
|
||
| test/functional/issues_controller_test.rb | ||
|---|---|---|
|
assert_response :success
|
||
|
# default filter
|
||
|
assert_query_filters [['status_id', 'o', '']]
|
||
|
assert_query_filters [
|
||
|
['status_id', 'o', ''],
|
||
|
['any_searchable', '~', '']
|
||
|
]
|
||
|
end
|
||
|
def test_index_with_project_and_filter
|
||
| ... | ... | |
|
'*' => {:op => '*', :values => ['']}
|
||
|
}
|
||
|
}
|
||
|
default_filter = {'status_id' => {:operator => 'o', :values => ['']}}
|
||
|
default_filter = {
|
||
|
'status_id' => {:operator => 'o', :values => ['']},
|
||
|
'any_searchable' => {:operator => '~', :values => ['']}
|
||
|
}
|
||
|
to_test.each do |field, expression_and_expected|
|
||
|
expression_and_expected.each do |filter_expression, expected|
|
||
|
get(:index, :params => {:set_filter => 1, field => filter_expression})
|
||
| test/unit/query_test.rb | ||
|---|---|---|
|
assert_equal [1, 3], find_issues_with_query(query).map(&:id).sort
|
||
|
end
|
||
|
def test_filter_that_does_not_require_value_should_not_be_skipped
|
||
|
open_issue = Issue.generate!(:status => IssueStatus.where(:is_closed => false).first)
|
||
|
closed_issue = Issue.generate!(:status => IssueStatus.where(:is_closed => true).first)
|
||
|
query = IssueQuery.new(
|
||
|
:name => '_',
|
||
|
:filters => {
|
||
|
'status_id' => {:operator => 'o', :values => ['']}
|
||
|
}
|
||
|
)
|
||
|
assert query.valid?
|
||
|
assert_includes query.issues, open_issue
|
||
|
assert_not_includes query.issues, closed_issue
|
||
|
end
|
||
|
def test_filter_any_searchable
|
||
|
User.current = User.find(1)
|
||
|
query = IssueQuery.new(
|
||
| ... | ... | |
|
assert_equal [1, 2, 3], result.map(&:id).sort
|
||
|
end
|
||
|
def test_filter_any_searchable_with_blank_value_should_be_noop
|
||
|
User.current = User.find(1)
|
||
|
base_query = IssueQuery.new(
|
||
|
:name => '_',
|
||
|
:filters => {
|
||
|
'status_id' => {:operator => 'o', :values => ['']}
|
||
|
}
|
||
|
)
|
||
|
query = IssueQuery.new(
|
||
|
:name => '_',
|
||
|
:filters => {
|
||
|
'status_id' => {:operator => 'o', :values => ['']},
|
||
|
'any_searchable' => {:operator => '~', :values => ['']}
|
||
|
}
|
||
|
)
|
||
|
assert query.valid?
|
||
|
assert_equal base_query.statement, query.statement
|
||
|
assert_equal base_query.issues.pluck(:id).sort, query.issues.pluck(:id).sort
|
||
|
end
|
||
|
def test_filter_any_searchable_with_partially_blank_value_should_be_invalid
|
||
|
set_language_if_valid 'en'
|
||
|
User.current = User.find(1)
|
||
|
query = IssueQuery.new(
|
||
|
:name => '_',
|
||
|
:filters => {
|
||
|
'status_id' => {:operator => 'o', :values => ['']},
|
||
|
'any_searchable' => {:operator => '><', :values => ['', 'recipe']}
|
||
|
}
|
||
|
)
|
||
|
assert_not query.valid?
|
||
|
assert_include 'Any searchable text cannot be blank', query.errors.full_messages
|
||
|
end
|
||
|
def test_filter_any_searchable_with_multiple_words
|
||
|
User.current = User.find(1)
|
||
|
query = IssueQuery.new(
|
||
- « Previous
- 1
- 2
- Next »