From: colemanw <coleman@civicrm.org>
Date: Thu, 23 Sep 2021 19:19:56 +0000 (-0400)
Subject: Merge pull request #21457 from colemanw/searchDisplayAfformDelete
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ab5dd705acae84fcbbc14bcff080fd3c76fc2214;p=civicrm-core.git

Merge pull request #21457 from colemanw/searchDisplayAfformDelete

Fixes dev/core#2824 - Handle related Afforms when deleting Search Displays
---

ab5dd705acae84fcbbc14bcff080fd3c76fc2214
diff --cc ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js
index f6b22aeeaa,7fd093d1e6..64868513b7
--- a/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js
+++ b/ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.component.js
@@@ -6,9 -6,10 +6,10 @@@
        savedSearch: '<'
      },
      templateUrl: '~/crmSearchAdmin/crmSearchAdmin.html',
 -    controller: function($scope, $element, $location, $timeout, crmApi4, dialogService, searchMeta, formatForSelect2) {
 +    controller: function($scope, $element, $location, $timeout, crmApi4, dialogService, searchMeta) {
        var ts = $scope.ts = CRM.ts('org.civicrm.search_kit'),
          ctrl = this,
+         afformLoad,
          fieldsForJoinGetters = {};
  
        this.DEFAULT_AGGREGATE_FN = 'GROUP_CONCAT';