From 0d2e207f9df2fa4a8158d0bdbc704feab83e962b Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 11 Oct 2021 11:34:57 -0400
Subject: [PATCH] Afform - fix loading custom fields for search displays

---
 ext/afform/admin/Civi/AfformAdmin/AfformAdminMeta.php      | 2 +-
 ext/afform/admin/Civi/Api4/Action/Afform/LoadAdminData.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/afform/admin/Civi/AfformAdmin/AfformAdminMeta.php b/ext/afform/admin/Civi/AfformAdmin/AfformAdminMeta.php
index b81b0251d7..93d700d624 100644
--- a/ext/afform/admin/Civi/AfformAdmin/AfformAdminMeta.php
+++ b/ext/afform/admin/Civi/AfformAdmin/AfformAdminMeta.php
@@ -124,7 +124,7 @@ class AfformAdminMeta {
     $fields = (array) civicrm_api4($entityName, 'getFields', $params);
 
     // Add implicit joins to search fields
-    if ($params['action'] === 'search') {
+    if ($params['action'] === 'get') {
       foreach (array_reverse($fields, TRUE) as $index => $field) {
         if (!empty($field['fk_entity']) && !$field['options']) {
           $fkLabelField = CoreUtil::getInfoItem($field['fk_entity'], 'label_field');
diff --git a/ext/afform/admin/Civi/Api4/Action/Afform/LoadAdminData.php b/ext/afform/admin/Civi/Api4/Action/Afform/LoadAdminData.php
index b2df1daa1b..46f4d3279d 100644
--- a/ext/afform/admin/Civi/Api4/Action/Afform/LoadAdminData.php
+++ b/ext/afform/admin/Civi/Api4/Action/Afform/LoadAdminData.php
@@ -162,7 +162,7 @@ class LoadAdminData extends \Civi\Api4\Generic\AbstractAction {
     }
 
     if ($info['definition']['type'] === 'search') {
-      $getFieldsMode = 'search';
+      $getFieldsMode = 'get';
       $displayTags = [];
       if ($newForm) {
         [$searchName, $displayName] = array_pad(explode('.', $this->entity ?? ''), 2, '');
-- 
2.25.1