From 5a7ed63e6dd214cf79589ee3d2c2884a3f76cd6b Mon Sep 17 00:00:00 2001 From: Kevin Fischer Date: Wed, 15 Apr 2020 17:33:16 +0900 Subject: Stop database access when defining IssueQuery class --- app/models/query.rb | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/app/models/query.rb b/app/models/query.rb index 100728cff..3f82a2293 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -28,9 +28,6 @@ class QueryColumn self.name = name self.sortable = options[:sortable] self.groupable = options[:groupable] || false - if groupable == true - self.groupable = name.to_s - end self.totalable = options[:totalable] || false self.default_order = options[:default_order] @inline = options.key?(:inline) ? options[:inline] : true @@ -82,13 +79,15 @@ class QueryColumn def css_classes name end + + def group_by_statement + name.to_s + end end class TimestampQueryColumn < QueryColumn - def groupable - if @groupable - Redmine::Database.timestamp_to_date(sortable, User.current.time_zone) - end + def group_by_statement + Redmine::Database.timestamp_to_date(sortable, User.current.time_zone) end def group_value(object) @@ -127,6 +126,10 @@ class QueryCustomFieldColumn < QueryColumn @cf = custom_field end + def group_by_statement + @cf.group_statement + end + def caption @cf.name end @@ -869,7 +872,7 @@ class Query < ActiveRecord::Base end def group_by_statement - group_by_column.try(:groupable) + group_by_column.try(:group_by_statement) end def project_statement -- 2.21.1 (Apple Git-122.3)