[59174] Fixed group row name rendering

opf · Dec 4, 2024 · 6937a73 · 6937a73
1 parent f68bdc4
commit 6937a73
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/app/models/custom_field/hierarchy/item.rb b/app/models/custom_field/hierarchy/item.rb
@@ -36,5 +36,5 @@ class CustomField::Hierarchy::Item < ApplicationRecord
 
   scope :including_children, -> { includes(children: :children) }
 
-  def to_s = label
+  def to_s = short.nil? ? label : "#{label} (#{short})"
 end
diff --git a/lib/api/decorators/aggregation_group.rb b/lib/api/decorators/aggregation_group.rb
@@ -33,11 +33,9 @@ def initialize(group_key, count, query:, current_user:)
         @count = count
         @query = query
 
-        if group_key.is_a?(Array)
-          group_key = set_links!(group_key)
-        end
-
-        @link = ::API::V3::Utilities::ResourceLinkGenerator.make_link(group_key)
+        @link = ::API::V3::Utilities::ResourceLinkGenerator.make_link(
+          group_key.is_a?(Array) ? set_links!(group_key) : group_key
+        )
 
         super(group_key, current_user:)
       end
@@ -86,10 +84,13 @@ def set_links!(group_key)
       end
 
       def value
-        if represented == true || represented == false
+        case represented
+        when TrueClass || FalseClass
           represented
+        when Array
+          represented.map(&:to_s).join(", ")
         else
-          represented ? represented.to_s : nil
+          represented&.to_s
         end
       end