Merge pull request #31485 from civicrm/5.80

5.80
civicrm · Nov 15, 2024 · 9a3717d · 9a3717d
2 parents d755914 + 3923c8e
commit 9a3717d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayToggleCollapse.component.js b/ext/search_kit/ang/crmSearchDisplayTable/crmSearchDisplayToggleCollapse.component.js
@@ -19,6 +19,7 @@
         } else {
           row.collapsed = false;
         }
+        // Button is irrelevant without any descendents; hide it without breaking the layout.
         if (!row.data._descendents) {
           $element.css('visibility', 'hidden');
         }
@@ -51,7 +52,7 @@
           // Hiding rows is simple, just hide all of them, but when un-hiding we need to skip over
           // the children of collapsed elements.
           if (!hide && ctrl.rows[i].collapsed) {
-            i += ctrl.rows[i]._descendents;
+            i += ctrl.rows[i].data._descendents;
           }
         }
       };

diff --git a/schema/Financial/FinancialAccount.entityType.php b/schema/Financial/FinancialAccount.entityType.php
@@ -10,7 +10,7 @@
     'description' => ts('Financial Accounts'),
     'log' => TRUE,
     'add' => '3.2',
-    'label_field' => 'name',
+    'label_field' => 'label',
   ],
   'getPaths' => fn() => [
     'add' => 'civicrm/admin/financial/financialAccount/edit?action=add&reset=1',

diff --git a/schema/Financial/FinancialType.entityType.php b/schema/Financial/FinancialType.entityType.php
@@ -10,7 +10,7 @@
     'description' => ts('Formerly civicrm_contribution_type merged into this table in 4.3'),
     'log' => TRUE,
     'add' => '1.3',
-    'label_field' => 'name',
+    'label_field' => 'label',
   ],
   'getPaths' => fn() => [
     'add' => 'civicrm/admin/financial/financialType/edit?action=add&reset=1',