From a4321c5db9c2c707f9182c24c1209bffa04d75bb Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Tue, 2 Mar 2021 15:37:16 -0500 Subject: [PATCH] SearchKit - Take search filters from the url when viewing a standalone searchDisplay This passes through all query params from the url fragment as search filters to the display. --- ext/search/Civi/Search/Display.php | 2 +- ext/search/ang/crmSearchPage.module.js | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ext/search/Civi/Search/Display.php b/ext/search/Civi/Search/Display.php index 1e784ea38a..302164de06 100644 --- a/ext/search/Civi/Search/Display.php +++ b/ext/search/Civi/Search/Display.php @@ -24,7 +24,7 @@ class Display { $partials = []; foreach (self::getDisplayTypes(['id', 'name']) as $type) { $partials["~/$moduleName/displayType/{$type['id']}.html"] = - '<' . $type['name'] . ' api-entity="{{:: $ctrl.apiEntity }}" search="$ctrl.searchName" display="$ctrl.display.name" settings="$ctrl.display.settings">'; + '<' . $type['name'] . ' api-entity="{{:: $ctrl.apiEntity }}" search="$ctrl.searchName" display="$ctrl.display.name" settings="$ctrl.display.settings" filters="$ctrl.filters">'; } return $partials; } diff --git a/ext/search/ang/crmSearchPage.module.js b/ext/search/ang/crmSearchPage.module.js index 42e429e85e..6a19473954 100644 --- a/ext/search/ang/crmSearchPage.module.js +++ b/ext/search/ang/crmSearchPage.module.js @@ -25,11 +25,15 @@ }) // Controller for displaying a search - .controller('crmSearchPageDisplay', function($scope, $routeParams, $location, display) { + .controller('crmSearchPageDisplay', function($scope, $location, display) { + var ctrl = $scope.$ctrl = this; this.display = display; this.searchName = display['saved_search.name']; this.apiEntity = display['saved_search.api_entity']; - $scope.$ctrl = this; + + $scope.$watch(function() {return $location.search();}, function(params) { + ctrl.filters = params; + }); }); })(angular, CRM.$, CRM._); -- 2.25.1