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

diff --git a/app/models/query.rb b/app/models/query.rb
index dc3947400c7b959ed172259f1c839f225270992b..aba3dc8549a29642c55134e58c82b336f8007008 100644 (file)
--- 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 6b555b94a73322989cd4344fe560f16fee89ecc8..e6761c21150306c4b086abdc99f3f8d623c3e60c 100644 (file)
--- 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']