From c69d318cb78cbf8ff1acc858fa4eba92aff26ac4 Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Tue, 23 Apr 2024 11:01:26 +1000 Subject: [PATCH 1/2] Fix email bounce search kit to correctly use the email id --- CRM/Mailing/Event/DAO/MailingEventQueue.php | 3 ++- ext/civi_mail/ang/afsearchEmailBounceHistory.aff.html | 2 +- xml/schema/Mailing/Event/MailingEventQueue.xml | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CRM/Mailing/Event/DAO/MailingEventQueue.php b/CRM/Mailing/Event/DAO/MailingEventQueue.php index b66c42b149f..699bd1c7732 100644 --- a/CRM/Mailing/Event/DAO/MailingEventQueue.php +++ b/CRM/Mailing/Event/DAO/MailingEventQueue.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Mailing/Event/MailingEventQueue.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:2b49f3437ecc6f6d2bf0c45370cb1089) + * (GenCodeChecksum:cd351f498a45de7365fd99d9f24e299c) */ /** @@ -248,6 +248,7 @@ public static function &fields() { 'FKClassName' => 'CRM_Core_DAO_Email', 'FKColumnName' => 'id', 'html' => [ + 'type' => 'entityRef', 'label' => ts("Email"), ], 'add' => NULL, diff --git a/ext/civi_mail/ang/afsearchEmailBounceHistory.aff.html b/ext/civi_mail/ang/afsearchEmailBounceHistory.aff.html index 003d1fc1346..4f669a7ea24 100644 --- a/ext/civi_mail/ang/afsearchEmailBounceHistory.aff.html +++ b/ext/civi_mail/ang/afsearchEmailBounceHistory.aff.html @@ -1,4 +1,4 @@
- +
diff --git a/xml/schema/Mailing/Event/MailingEventQueue.xml b/xml/schema/Mailing/Event/MailingEventQueue.xml index 3850ee28f90..47de33d2f37 100644 --- a/xml/schema/Mailing/Event/MailingEventQueue.xml +++ b/xml/schema/Mailing/Event/MailingEventQueue.xml @@ -77,6 +77,7 @@ FK to Email + entityRef From eb6e5379df402f0d9dc0cc4191f5927e283d4d11 Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Tue, 23 Apr 2024 11:59:22 +1000 Subject: [PATCH 2/2] Fix url argument passed to form builder --- templates/CRM/Contact/Page/Inline/Email.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/CRM/Contact/Page/Inline/Email.tpl b/templates/CRM/Contact/Page/Inline/Email.tpl index bdd8503bd0b..f7df7a8d380 100644 --- a/templates/CRM/Contact/Page/Inline/Email.tpl +++ b/templates/CRM/Contact/Page/Inline/Email.tpl @@ -46,7 +46,7 @@ {$item.email} {/if} {crmAPI var='civi_mail' entity='Extension' action='get' full_name="civi_mail" is_active=1} - {if $item.on_hold == 2} ({ts}On Hold - Opt Out{/ts}) {ts}{$item.hold_date|truncate:10:''|crmDate}{/ts}{elseif $item.on_hold} {if $civi_mail.count}{/if}({ts}On Hold{/ts}) {ts}{$item.hold_date|truncate:10:''|crmDate}{/ts}{if $civi_mail.count} {/if}{/if}{if $item.is_bulkmail} ({ts}Bulk{/ts}){/if} + {if $item.on_hold == 2} ({ts}On Hold - Opt Out{/ts}) {ts}{$item.hold_date|truncate:10:''|crmDate}{/ts}{elseif $item.on_hold} {if $civi_mail.count}{/if}({ts}On Hold{/ts}) {ts}{$item.hold_date|truncate:10:''|crmDate}{/ts}{if $civi_mail.count} {/if}{/if}{if $item.is_bulkmail} ({ts}Bulk{/ts}){/if} {if !empty($item.signature_text) OR !empty($item.signature_html)} {ts}(signature){/ts}