From 6a87c0cb3b29a467cf432399596b5f337aa793e5 Mon Sep 17 00:00:00 2001 From: "Matthew Wire (MJW Consulting)" Date: Thu, 6 Jun 2019 16:11:29 +0100 Subject: [PATCH] Don't search before showing smartgroup criteria --- templates/CRM/Contact/Form/Search/Intro.tpl | 6 +++--- templates/CRM/Group/Form/Edit.tpl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/CRM/Contact/Form/Search/Intro.tpl b/templates/CRM/Contact/Form/Search/Intro.tpl index 2e668c4941..63ae287227 100644 --- a/templates/CRM/Contact/Form/Search/Intro.tpl +++ b/templates/CRM/Contact/Form/Search/Intro.tpl @@ -29,11 +29,11 @@ {* Provide link to modify smart group search criteria if we are viewing a smart group (ssID = saved search ID) *} {if !empty($ssID)} {if $ssMappingID} - {capture assign=editSmartGroupURL}{crmURL p="civicrm/contact/search/builder" q="reset=1&force=1&ssID=`$ssID`"}{/capture} + {capture assign=editSmartGroupURL}{crmURL p="civicrm/contact/search/builder" q="reset=1&ssID=`$ssID`"}{/capture} {elseif $savedSearch.search_custom_id} - {capture assign=editSmartGroupURL}{crmURL p="civicrm/contact/search/custom" q="reset=1&force=1&ssID=`$ssID`"}{/capture} + {capture assign=editSmartGroupURL}{crmURL p="civicrm/contact/search/custom" q="reset=1&ssID=`$ssID`"}{/capture} {else} - {capture assign=editSmartGroupURL}{crmURL p="civicrm/contact/search/advanced" q="reset=1&force=1&ssID=`$ssID`"}{/capture} + {capture assign=editSmartGroupURL}{crmURL p="civicrm/contact/search/advanced" q="reset=1&ssID=`$ssID`"}{/capture} {/if}
{ts 1=$group.title}Edit Smart Group Search Criteria for %1{/ts} diff --git a/templates/CRM/Group/Form/Edit.tpl b/templates/CRM/Group/Form/Edit.tpl index dd516783fb..6fbab00645 100644 --- a/templates/CRM/Group/Form/Edit.tpl +++ b/templates/CRM/Group/Form/Edit.tpl @@ -102,11 +102,11 @@ {if $group.saved_search_id}
{if $group.mapping_id} - » {ts}Edit Smart Group Criteria{/ts} + » {ts}Edit Smart Group Criteria{/ts} {elseif $group.search_custom_id} - » {ts}Edit Smart Group Criteria{/ts} + » {ts}Edit Smart Group Criteria{/ts} {else} - » {ts}Edit Smart Group Criteria{/ts} + » {ts}Edit Smart Group Criteria{/ts} {/if} {/if} -- 2.25.1