Merged r20783 from trunk to 4.1-stable (#33548).

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@20784 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 11 insertions, 1 deletions

diff --git a/app/models/query.rb b/app/models/query.rb
index a57cfe442..152b11cf1 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -51,7 +51,7 @@ class QueryColumn
 
   # Returns true if the column is sortable, otherwise false
   def sortable?
-    !@sortable.nil?
+    @sortable.present?
   end
 
   def sortable
diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb
index fcb554ecf..d080ad846 100644
--- a/test/unit/query_test.rb
+++ b/test/unit/query_test.rb
@@ -1630,6 +1630,16 @@ class QueryTest < ActiveSupport::TestCase
     assert !q.sortable_columns['cf_1']
   end
 
+  def test_sortable_should_return_false_for_multi_custom_field
+    field = CustomField.find(1)
+    field.update_attribute :multiple, true
+
+    q = IssueQuery.new
+
+    field_column = q.available_columns.detect {|c| c.name==:cf_1}
+    assert !field_column.sortable?
+  end
+
   def test_default_sort
     q = IssueQuery.new
     assert_equal [['id', 'desc']], q.sort_criteria