meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-10 19:23:06 +00:00
Code Issues Releases Wiki Activity

Merged r18103 from trunk to 3.4-stable (#31276).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@18105 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2019-04-30 03:33:17 +00:00
parent f2c50effe8
commit 5490963223
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/query.rb
View File

@ -399,6 +399,8 @@ class Query < ActiveRecord::Base
params[:v][field] = options[:values]
end
params[:c] = column_names
params[:group_by] = group_by.to_s if group_by.present?
params[:t] = totalable_names.map(&:to_s) if totalable_names.any?
params[:sort] = sort_criteria.to_param
params[:set_filter] = 1
params

15
test/unit/query_test.rb
View File

@ -2162,4 +2162,19 @@ class QueryTest < ActiveSupport::TestCase
assert_equal ['1','2','3','4','5','6'], query.available_filters['status_id'][:values].map(&:second)
end
def test_as_params_should_serialize_query
query = IssueQuery.new(name: "_")
query.add_filter('subject', '!~', ['asdf'])
query.group_by = 'tracker'
query.totalable_names = %w(estimated_hours)
query.column_names = %w(id subject estimated_hours)
assert hsh = query.as_params
new_query = IssueQuery.build_from_params(hsh)
assert_equal query.filters, new_query.filters
assert_equal query.group_by, new_query.group_by
assert_equal query.column_names, new_query.column_names
assert_equal query.totalable_names, new_query.totalable_names
end
end