Skip to content
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

Fix email bounce search kit to correctly use the email id #8

Draft
wants to merge 2 commits into
base: 5.70
Choose a base branch
from
Draft

Fix email bounce search kit to correctly use the email id #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c69d318
Fix email bounce search kit to correctly use the email id
seamuslee001 Apr 23, 2024
eb6e537
Fix url argument passed to form builder
seamuslee001 Apr 23, 2024
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: 2 additions & 1 deletion CRM/Mailing/Event/DAO/MailingEventQueue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
*/

/**
Expand Down Expand Up @@ -248,6 +248,7 @@ public static function &fields() {
'FKClassName' => 'CRM_Core_DAO_Email',
'FKColumnName' => 'id',
'html' => [
'type' => 'entityRef',
'label' => ts("Email"),
],
'add' => NULL,
Expand Down
2 changes: 1 addition & 1 deletion ext/civi_mail/ang/afsearchEmailBounceHistory.aff.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div af-fieldset="">
<crm-search-display-table search-name="Email_Bounce_History" display-name="Email_Bounce_History_Table" filters="{'MailingEventBounce_MailingEventQueue_event_queue_id_01.id': routeParams['MailingEventBounce_MailingEventQueue_event_queue_id_01.email_id']}">
<crm-search-display-table search-name="Email_Bounce_History" display-name="Email_Bounce_History_Table" filters="{'MailingEventBounce_MailingEventQueue_event_queue_id_01.email_id': routeParams.email_id}">
</crm-search-display-table>
</div>
2 changes: 1 addition & 1 deletion templates/CRM/Contact/Page/Inline/Email.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}&nbsp;({ts}On Hold - Opt Out{/ts})&nbsp;{ts}{$item.hold_date|truncate:10:''|crmDate}{/ts}{elseif $item.on_hold}&nbsp;{if $civi_mail.count}<a href="{crmURL p="civicrm/contact/view/bounces" q="email_id=`$item.id`"}" class="crm-popup" title="{ts 1=$item.email}Email Bounce History{/ts}">{/if}({ts}On Hold{/ts})&nbsp;{ts}{$item.hold_date|truncate:10:''|crmDate}{/ts}{if $civi_mail.count}&nbsp;<i class="crm-i fa-list-alt" aria-hidden="true"></i></a>{/if}{/if}{if $item.is_bulkmail}&nbsp;({ts}Bulk{/ts}){/if}
{if $item.on_hold == 2}&nbsp;({ts}On Hold - Opt Out{/ts})&nbsp;{ts}{$item.hold_date|truncate:10:''|crmDate}{/ts}{elseif $item.on_hold}&nbsp;{if $civi_mail.count}<a href="{crmURL p="civicrm/contact/view/bounces" f="?email_id=`$item.id`"}" class="crm-popup" title="{ts 1=$item.email}Email Bounce History{/ts}">{/if}({ts}On Hold{/ts})&nbsp;{ts}{$item.hold_date|truncate:10:''|crmDate}{/ts}{if $civi_mail.count}&nbsp;<i class="crm-i fa-list-alt" aria-hidden="true"></i></a>{/if}{/if}{if $item.is_bulkmail}&nbsp;({ts}Bulk{/ts}){/if}
{if !empty($item.signature_text) OR !empty($item.signature_html)}
<span class="signature-link description">
<a href="#" title="{ts}Signature{/ts}" onClick="showHideSignature( '{$blockId}' ); return false;">{ts}(signature){/ts}</a>
Expand Down
1 change: 1 addition & 0 deletions xml/schema/Mailing/Event/MailingEventQueue.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
<comment>FK to Email</comment>
<html>
<label>Email</label>
<type>entityRef</type>
</html>
</field>
<foreignKey>
Expand Down