From 3abf021e4bc7e67cf2328a86a598000fae8da2d5 Mon Sep 17 00:00:00 2001 From: Marius Balteanu Date: Sun, 26 Nov 2023 13:53:41 +0000 Subject: [PATCH] Fix query grouping filter not working for custom field relations (#39714). Patch Alexander Meindl. git-svn-id: https://svn.redmine.org/redmine/trunk@22478 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/queries_helper.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb index b90f86457..d2505ff6f 100644 --- a/app/helpers/queries_helper.rb +++ b/app/helpers/queries_helper.rb @@ -26,15 +26,15 @@ module QueriesHelper ungrouped = [] grouped = {label_string: [], label_date: [], label_time_tracking: [], label_attachment: []} query.available_filters.map do |field, field_options| - if field =~ /^(.+)\./ + if /^cf_\d+\./.match?(field) + group = (field_options[:through] || field_options[:field]).try(:name) + elsif field =~ /^(.+)\./ # association filters group = "field_#{$1}".to_sym elsif field_options[:type] == :relation group = :label_relations elsif field_options[:type] == :tree group = query.is_a?(IssueQuery) ? :label_relations : nil - elsif /^cf_\d+\./.match?(field) - group = (field_options[:through] || field_options[:field]).try(:name) elsif %w(member_of_group assigned_to_role).include?(field) group = :field_assigned_to elsif field_options[:type] == :date_past || field_options[:type] == :date -- 2.39.5