Skip to content

Merge 6.18 to master #36441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eileenmcnaughton merged 2 commits into from
Aug 7, 2026
+3 −0
Merged

Merge 6.18 to master #36441

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbdccfb
SearchKit - Fix missing smart group config
colemanw Aug 7, 2026
4cb7fdb
Merge pull request #36433 from colemanw/searchKitSmartGroup
colemanw Aug 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ext/search_kit/ang/crmSearchAdmin/crmSearchAdmin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ <h1 crm-page-title>{{ ($ctrl.savedSearch.is_template ? ts('Search Template') : t
<div ng-repeat="activeTab in $ctrl.mainTabs" class="panel-body" role="tabpanel" ng-if="controls.tab === activeTab.key">
<div ng-include="activeTab.template" class="crm-search-admin-relative"></div>
</div>
<div class="panel-body" role="tabpanel" ng-if="controls.tab === 'group'">
<div ng-include="'~/crmSearchAdmin/crmSearch-group.html'" class="crm-search-admin-relative"></div>
</div>
<div ng-if="$ctrl.selectedDisplay()" class="panel-body" role="tabpanel">
<div ng-repeat="display in $ctrl.savedSearch.displays" ng-if="controls.tab === ('display_' + $index)">
<crm-search-admin-display class="crm-search-admin-relative" display="display" saved-search="$ctrl.savedSearch"></crm-search-admin-display>
Expand Down