meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 23:11:12 +00:00
Code Issues Releases Wiki Activity

Custom queries are broken by updating with nil parameter values (#29701).

Browse Source 
Patch by Mizuki ISHIKAWA.


git-svn-id: http://svn.redmine.org/redmine/trunk@17566 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2018-10-04 12:46:32 +00:00
parent f199fd54b7
commit 28c231473f
4 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/queries_controller.rb
View File

@ -122,7 +122,7 @@ class QueriesController < ApplicationController
@query.project = params[:query_is_for_all] ? nil : @project @query.project = params[:query_is_for_all] ? nil : @project
@query.build_from_params(params) @query.build_from_params(params)
@query.column_names = nil if params[:default_columns] @query.column_names = nil if params[:default_columns]
@query.sort_criteria = params[:query] && params[:query][:sort_criteria] @query.sort_criteria = (params[:query] && params[:query][:sort_criteria]) || @query.sort_criteria
@query.name = params[:query] && params[:query][:name] @query.name = params[:query] && params[:query][:name]
if User.current.allowed_to?(:manage_public_queries, @query.project) || User.current.admin? if User.current.allowed_to?(:manage_public_queries, @query.project) || User.current.admin?
@query.visibility = (params[:query] && params[:query][:visibility]) || Query::VISIBILITY_PRIVATE @query.visibility = (params[:query] && params[:query][:visibility]) || Query::VISIBILITY_PRIVATE

4
app/models/issue_query.rb
View File

@ -75,8 +75,8 @@ class IssueQuery < Query
def build_from_params(params, defaults={}) def build_from_params(params, defaults={})
super super
self.draw_relations = params[:draw_relations] || (params[:query] && params[:query][:draw_relations]) self.draw_relations = params[:draw_relations] || (params[:query] && params[:query][:draw_relations]) || options[:draw_relations]
self.draw_progress_line = params[:draw_progress_line] || (params[:query] && params[:query][:draw_progress_line]) self.draw_progress_line = params[:draw_progress_line] || (params[:query] && params[:query][:draw_progress_line]) || options[:draw_progress_line]
self self
end end

8
app/models/query.rb
View File

@ -377,10 +377,10 @@ class Query < ActiveRecord::Base
end end
query_params = params[:query] || defaults || {} query_params = params[:query] || defaults || {}
self.group_by = params[:group_by] || query_params[:group_by] self.group_by = params[:group_by] || query_params[:group_by] || self.group_by
self.column_names = params[:c] || query_params[:column_names] self.column_names = params[:c] || query_params[:column_names] || self.column_names
self.totalable_names = params[:t] || query_params[:totalable_names] self.totalable_names = params[:t] || query_params[:totalable_names] || self.totalable_names
self.sort_criteria = params[:sort] || query_params[:sort_criteria] self.sort_criteria = params[:sort] || query_params[:sort_criteria] || self.sort_criteria
self self
end end

15
test/unit/query_test.rb
View File

@ -1873,6 +1873,21 @@ class QueryTest < ActiveSupport::TestCase
assert_nil IssueQuery.visible(User.find(1)).find_by_id(q.id) assert_nil IssueQuery.visible(User.find(1)).find_by_id(q.id)
end end
def test_build_from_params_should_not_update_query_with_nil_param_values
q = IssueQuery.create!(:name => 'Query',
:type => "IssueQuery",
:user => User.find(7),
:filters => {"status_id" => {:values => ["1"], :operator => "o"}},
:column_names => [:tracker, :status],
:sort_criteria => ['id', 'asc'],
:group_by => "project",
:options => { :totalable_names=>[:estimated_hours], :draw_relations => '1', :draw_progress_line => '1' }
)
old_attributes = q.attributes
q.build_from_params({})
assert_equal old_attributes, q.attributes
end
test "#available_filters should include users of visible projects in cross-project view" do test "#available_filters should include users of visible projects in cross-project view" do
users = IssueQuery.new.available_filters["assigned_to_id"] users = IssueQuery.new.available_filters["assigned_to_id"]
assert_not_nil users assert_not_nil users