summaryrefslogtreecommitdiffstats
path: root/app/models/query.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2017-01-17 21:29:22 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2017-01-17 21:29:22 +0000
commit4a5ebfb778455ce0e0a989942714511a7f97f756 (patch)
treeb3f53882f919a51964fa002d0e9074a4a4868f37 /app/models/query.rb
parent82afdc7f78581d7c209926c0cce2eaee10915c4d (diff)
downloadredmine-4a5ebfb778455ce0e0a989942714511a7f97f756.tar.gz
redmine-4a5ebfb778455ce0e0a989942714511a7f97f756.zip
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
Diffstat (limited to 'app/models/query.rb')
-rw-r--r--app/models/query.rb3
1 files changed, 2 insertions, 1 deletions
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?