From 79264d5a7fa6ea0e5709f4ddef814d312c702c18 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Thu, 11 Nov 2021 12:47:51 +1300 Subject: [PATCH] Cleanup addCaampaignToSearch --- CRM/Campaign/BAO/Campaign.php | 12 ++---------- templates/CRM/Activity/Form/Search/Common.tpl | 4 ++-- .../CRM/Campaign/Form/addCampaignToComponent.tpl | 16 ++-------------- .../CRM/Campaign/Form/addCampaignToSearch.tpl | 8 ++++++++ templates/CRM/Contribute/Form/Search/Common.tpl | 2 +- .../CRM/Contribute/Form/SearchContribution.tpl | 4 ++-- templates/CRM/Event/Form/Search/Common.tpl | 2 +- templates/CRM/Event/Form/SearchEvent.tpl | 2 +- templates/CRM/Mailing/Form/Search.tpl | 4 ++-- templates/CRM/Mailing/Form/Search/Common.tpl | 2 +- templates/CRM/Member/Form/Search/Common.tpl | 2 +- templates/CRM/Pledge/Form/Search/Common.tpl | 4 ++-- 12 files changed, 25 insertions(+), 37 deletions(-) create mode 100644 templates/CRM/Campaign/Form/addCampaignToSearch.tpl diff --git a/CRM/Campaign/BAO/Campaign.php b/CRM/Campaign/BAO/Campaign.php index a4dc88945d..cff5bcaa07 100644 --- a/CRM/Campaign/BAO/Campaign.php +++ b/CRM/Campaign/BAO/Campaign.php @@ -599,16 +599,8 @@ INNER JOIN civicrm_group grp ON ( grp.id = campgrp.entity_id ) ['id' => 'campaigns', 'multiple' => 'multiple', 'class' => 'crm-select2'] ); } - $infoFields = [ - 'elementName', - 'hasAccessCampaign', - 'isCampaignEnabled', - 'showCampaignInSearch', - ]; - foreach ($infoFields as $fld) { - $campaignInfo[$fld] = $$fld; - } - $form->assign('campaignInfo', $campaignInfo); + + $form->assign('campaignElementName', $showCampaignInSearch ? $elementName : ''); } /** diff --git a/templates/CRM/Activity/Form/Search/Common.tpl b/templates/CRM/Activity/Form/Search/Common.tpl index b8eeb9dda5..0759d8e2bb 100644 --- a/templates/CRM/Activity/Form/Search/Common.tpl +++ b/templates/CRM/Activity/Form/Search/Common.tpl @@ -114,8 +114,8 @@ {/if} {* campaign in activity search *} -{include file="CRM/Campaign/Form/addCampaignToComponent.tpl" -campaignContext="componentSearch" campaignTrClass='' campaignTdClass=''} +{include file="CRM/Campaign/Form/addCampaignToSearch.tpl" +campaignTrClass='' campaignTdClass=''} {if !empty($activityGroupTree)} diff --git a/templates/CRM/Campaign/Form/addCampaignToComponent.tpl b/templates/CRM/Campaign/Form/addCampaignToComponent.tpl index d92963147b..07e0e36803 100644 --- a/templates/CRM/Campaign/Form/addCampaignToComponent.tpl +++ b/templates/CRM/Campaign/Form/addCampaignToComponent.tpl @@ -1,23 +1,11 @@ {* add campaigns to various components CRM-7362 *} -{if isset($campaignContext) and $campaignContext eq 'componentSearch'} - - {* add campaign in component search *} - - {assign var=elementName value=$campaignInfo.elementName} - - {if isset($form.$elementName)} - {$form.$elementName.label} {$form.$elementName.html} - {/if} - - - -{elseif $campaignInfo.showAddCampaign} +{if $campaignInfo.showAddCampaign} {$form.campaign_id.label} {help id="id-campaign_id" file="CRM/Campaign/Form/addCampaignToComponent.hlp"} {$form.campaign_id.html} -{/if}{* add campaign to component search if closed. *} +{/if} diff --git a/templates/CRM/Campaign/Form/addCampaignToSearch.tpl b/templates/CRM/Campaign/Form/addCampaignToSearch.tpl new file mode 100644 index 0000000000..2a183ef343 --- /dev/null +++ b/templates/CRM/Campaign/Form/addCampaignToSearch.tpl @@ -0,0 +1,8 @@ +{if $campaignElementName} + {* add campaign in component search *} + + + {$form.$campaignElementName.label} {$form.$campaignElementName.html} + + +{/if} diff --git a/templates/CRM/Contribute/Form/Search/Common.tpl b/templates/CRM/Contribute/Form/Search/Common.tpl index 99aa39bee9..c585ac38de 100644 --- a/templates/CRM/Contribute/Form/Search/Common.tpl +++ b/templates/CRM/Contribute/Form/Search/Common.tpl @@ -172,7 +172,7 @@ {* campaign in contribution search *} -{include file="CRM/Campaign/Form/addCampaignToComponent.tpl" campaignContext="componentSearch" +{include file="CRM/Campaign/Form/addCampaignToSearch.tpl" campaignTrClass='' campaignTdClass=''} {* contribution recurring search *} diff --git a/templates/CRM/Contribute/Form/SearchContribution.tpl b/templates/CRM/Contribute/Form/SearchContribution.tpl index 1a13c64abb..ae2d9650ac 100644 --- a/templates/CRM/Contribute/Form/SearchContribution.tpl +++ b/templates/CRM/Contribute/Form/SearchContribution.tpl @@ -30,8 +30,8 @@ {* campaign in contribution page search *} - {include file="CRM/Campaign/Form/addCampaignToComponent.tpl" - campaignContext="componentSearch" campaignTrClass='' campaignTdClass=''} + {include file="CRM/Campaign/Form/addCampaignToSearch.tpl" + campaignTrClass='' campaignTdClass=''}
{include file="CRM/common/formButtons.tpl"}
diff --git a/templates/CRM/Event/Form/Search/Common.tpl b/templates/CRM/Event/Form/Search/Common.tpl index 6e3c9845fe..b3b7e87b95 100644 --- a/templates/CRM/Event/Form/Search/Common.tpl +++ b/templates/CRM/Event/Form/Search/Common.tpl @@ -52,7 +52,7 @@ {* campaign in contribution search *} -{include file="CRM/Campaign/Form/addCampaignToComponent.tpl" campaignContext="componentSearch" +{include file="CRM/Campaign/Form/addCampaignToSearch.tpl" campaignTrClass='' campaignTdClass='crm-event-form-block-participant_campaign_id'} {if $participantGroupTree } diff --git a/templates/CRM/Event/Form/SearchEvent.tpl b/templates/CRM/Event/Form/SearchEvent.tpl index fb34c0b94f..fb278a55be 100644 --- a/templates/CRM/Event/Form/SearchEvent.tpl +++ b/templates/CRM/Event/Form/SearchEvent.tpl @@ -45,7 +45,7 @@ {* campaign in event search *} - {include file="CRM/Campaign/Form/addCampaignToComponent.tpl" campaignContext="componentSearch" + {include file="CRM/Campaign/Form/addCampaignToSearch.tpl" campaignTrClass='crm-event-searchevent-form-block-campaign_id' campaignTdClass=''} {include file="CRM/common/formButtons.tpl"} diff --git a/templates/CRM/Mailing/Form/Search.tpl b/templates/CRM/Mailing/Form/Search.tpl index b8dd9a4cf6..a355ca7ed7 100644 --- a/templates/CRM/Mailing/Form/Search.tpl +++ b/templates/CRM/Mailing/Form/Search.tpl @@ -52,8 +52,8 @@ {/if} {* campaign in mailing search *} - {include file="CRM/Campaign/Form/addCampaignToComponent.tpl" - campaignContext="componentSearch" campaignTrClass='' campaignTdClass=''} + {include file="CRM/Campaign/Form/addCampaignToSearch.tpl" + campaignTrClass='' campaignTdClass=''} {$form.buttons.html} diff --git a/templates/CRM/Mailing/Form/Search/Common.tpl b/templates/CRM/Mailing/Form/Search/Common.tpl index a5de3c8f44..8392543a39 100644 --- a/templates/CRM/Mailing/Form/Search/Common.tpl +++ b/templates/CRM/Mailing/Form/Search/Common.tpl @@ -66,7 +66,7 @@ {* campaign in Advance search *} - {include file="CRM/Campaign/Form/addCampaignToComponent.tpl" campaignContext="componentSearch" + {include file="CRM/Campaign/Form/addCampaignToSearch.tpl" campaignTrClass='crmCampaign' campaignTdClass='crmCampaignContainer'} diff --git a/templates/CRM/Member/Form/Search/Common.tpl b/templates/CRM/Member/Form/Search/Common.tpl index 87876b61ac..f816ea63bc 100644 --- a/templates/CRM/Member/Form/Search/Common.tpl +++ b/templates/CRM/Member/Form/Search/Common.tpl @@ -57,7 +57,7 @@ {* campaign in membership search *} -{include file="CRM/Campaign/Form/addCampaignToComponent.tpl" campaignContext="componentSearch" +{include file="CRM/Campaign/Form/addCampaignToSearch.tpl" campaignTrClass='' campaignTdClass=''} {if !empty($membershipGroupTree)} diff --git a/templates/CRM/Pledge/Form/Search/Common.tpl b/templates/CRM/Pledge/Form/Search/Common.tpl index 1f5c53e966..a073fa0c5b 100644 --- a/templates/CRM/Pledge/Form/Search/Common.tpl +++ b/templates/CRM/Pledge/Form/Search/Common.tpl @@ -77,8 +77,8 @@ {* campaign in pledge search *} -{include file="CRM/Campaign/Form/addCampaignToComponent.tpl" -campaignContext="componentSearch" campaignTrClass='' campaignTdClass=''} +{include file="CRM/Campaign/Form/addCampaignToSearch.tpl" +campaignTrClass='' campaignTdClass=''} {if !empty($pledgeGroupTree)} -- 2.25.1