From 4a5ebfb778455ce0e0a989942714511a7f97f756 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Tue, 17 Jan 2017 21:29:22 +0000 Subject: 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 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/models/query.rb') 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? -- cgit v1.2.3