From 4a5ebfb778455ce0e0a989942714511a7f97f756 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Tue, 17 Jan 2017 21:29:22 +0000 Subject: [PATCH] Fixed that Query#has_column? returns false with default columns. git-svn-id: http://svn.redmine.org/redmine/trunk@16217 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/query.rb | 3 ++- test/unit/query_test.rb | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/models/query.rb b/app/models/query.rb index dc3947400..aba3dc854 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -679,7 +679,8 @@ class Query < ActiveRecord::Base end def has_column?(column) - column_names && column_names.include?(column.is_a?(QueryColumn) ? column.name : column) + name = column.is_a?(QueryColumn) ? column.name : column + columns.detect {|c| c.name == name} end def has_custom_field_column? diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb index 6b555b94a..e6761c211 100644 --- a/test/unit/query_test.rb +++ b/test/unit/query_test.rb @@ -1170,6 +1170,14 @@ class QueryTest < ActiveSupport::TestCase assert !q.has_column?(category_column) end + def test_has_column_should_return_true_for_default_column + with_settings :issue_list_default_columns => %w(tracker subject) do + q = IssueQuery.new + assert q.has_column?(:tracker) + assert !q.has_column?(:category) + end + end + def test_inline_and_block_columns q = IssueQuery.new q.column_names = ['subject', 'description', 'tracker'] -- 2.39.5