Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-02-04 05:39:58 +01:00
Code Issues Packages Projects Releases Activity

Merged r20990 from trunk to 4.2-stable (#35201).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/4.2-stable@20991 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2021-05-07 04:47:24 +00:00
parent 7d78ed78b0
commit 512b594cb4
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/query.rb
View File

@@ -531,7 +531,7 @@ class Query < ActiveRecord::Base
if has_filter?(field) || !filter.remote
options[:values] = filter.values
if options[:values] && values_for(field)
missing = Array(values_for(field)).select(&:present?) - options[:values].map(&:last)
missing = Array(values_for(field)).select(&:present?) - options[:values].map{|v| v[1]}
if missing.any? && respond_to?(method = "find_#{field}_filter_values")
options[:values] += send(method, missing)
end

13
test/unit/query_test.rb
View File

@@ -1519,6 +1519,19 @@ class QueryTest < ActiveSupport::TestCase
end
end
def test_available_filters_as_json_should_not_include_duplicate_assigned_to_id_values
set_language_if_valid 'en'
user = User.find_by_login 'dlopper'
with_current_user User.find(1) do
q = IssueQuery.new
q.filters = {"assigned_to_id" => {:operator => '=', :values => user.id.to_s}}
filters = q.available_filters_as_json
assert_not_include [user.name, user.id.to_s], filters['assigned_to_id']['values']
assert_include [user.name, user.id.to_s, 'active'], filters['assigned_to_id']['values']
end
end
def test_available_filters_as_json_should_include_missing_author_id_values
user = User.generate!
with_current_user User.find(1) do