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

Fixed that Query#has_column? returns false with default columns.

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@16217 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2017-01-17 21:29:22 +00:00
parent 82afdc7f78
commit 4a5ebfb778
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/query.rb
View File

@ -679,7 +679,8 @@ class Query < ActiveRecord::Base
end end
def has_column?(column) 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 end
def has_custom_field_column? def has_custom_field_column?

8
test/unit/query_test.rb
View File

@ -1170,6 +1170,14 @@ class QueryTest < ActiveSupport::TestCase
assert !q.has_column?(category_column) assert !q.has_column?(category_column)
end 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 def test_inline_and_block_columns
q = IssueQuery.new q = IssueQuery.new
q.column_names = ['subject', 'description', 'tracker'] q.column_names = ['subject', 'description', 'tracker']