From: Go MAEDA <maeda@farend.jp>
Date: Wed, 21 Apr 2021 08:07:35 +0000 (+0000)
Subject: Merged r20956 from trunk to 4.2-stable (#35115).
X-Git-Tag: 4.2.1~8
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=188e27dc78a251de410d224e49986eb5179c585a;p=redmine.git

Merged r20956 from trunk to 4.2-stable (#35115).


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

diff --git a/app/models/query.rb b/app/models/query.rb
index 231ded24b..e8de4aa6d 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -179,7 +179,7 @@ class QueryAssociationCustomFieldColumn < QueryCustomFieldColumn
   def initialize(association, custom_field, options={})
     super(custom_field, options)
     self.name = "#{association}.cf_#{custom_field.id}".to_sym
-    # TODO: support sorting/grouping by association custom field
+    # TODO: support sorting by association custom field
     self.sortable = false
     self.groupable = false
     @association = association
@@ -194,6 +194,11 @@ class QueryAssociationCustomFieldColumn < QueryCustomFieldColumn
   def css_classes
     @css_classes ||= "#{@association}_cf_#{@cf.id} #{@cf.field_format}"
   end
+
+  # TODO: support grouping by association custom field
+  def groupable?
+    false
+  end
 end
 
 class QueryFilter