From 92bc2d7619d1d6d7d04dc4d2f84d25c3f69043d6 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 21 Jan 2025 15:56:45 +0000 Subject: [PATCH] Bug 37918: Add filter to existing email subjects --- koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc | 3 ++- .../intranet-tmpl/prog/en/modules/circ/branchoverdues.tt | 5 +++-- koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt | 3 ++- .../intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt | 3 ++- .../intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt | 3 ++- .../intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt | 5 +++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 3 ++- 7 files changed, 16 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc index f654f50c294..3a58e4768d3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc @@ -1,3 +1,4 @@ +[% USE EmailHeader %] [% USE KohaDates %] [% USE ItemTypes %] [% USE AuthorisedValues %] @@ -55,7 +56,7 @@ [% INCLUDE 'patron-title.inc' patron=reserveloo.borrower invert_name=1 no_title=1 %] [% IF ( reserveloo.borrower.phone ) %]
[% reserveloo.borrower.phone | html %][% END %] [% IF ( reserveloo.borrower.notice_email_address ) %] -
+
[% reserveloo.borrower.notice_email_address | html %]
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt index 641743e9ced..9d57e3309ba 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt @@ -1,4 +1,5 @@ [% USE raw %] +[% USE EmailHeader %] [% USE Branches %] [% USE Koha %] [% USE KohaDates %] @@ -73,7 +74,7 @@ [% overduesloo.borrowersurname | html %], [% overduesloo.borrowerfirstname | html %]
[% overduesloo.cardnumber | html %]
[% overduesloo.borrowerphone | html %]
- [% IF ( overduesloo.borroweremail ) %] + [% IF ( overduesloo.borroweremail ) %] [% overduesloo.borroweremail | html %][% END %] [% Branches.GetName( overduesloo.homebranch ) | html %] [% overduesloo.itemcallnumber | html %] @@ -114,7 +115,7 @@

[% todayoverduesloo.borrowersurname | html %]   [% todayoverduesloo.borrowerfirstname | html %]
[% todayoverduesloo.cardnumber | html %]

[% todayoverduesloo.borrowerphone | html %]
- [% IF ( todayoverduesloo.borroweremail ) %] + [% IF ( todayoverduesloo.borroweremail ) %] [% todayoverduesloo.borroweremail | html %][% END %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt index 8a985c11e92..0163da8d27f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt @@ -1,4 +1,5 @@ [% USE raw %] +[% USE EmailHeader %] [% USE Asset %] [% USE AuthorisedValues %] [% USE KohaDates %] @@ -111,7 +112,7 @@ [% INCLUDE 'patron-title.inc' patron=overdueloo.patron hide_patron_infos_if_needed=1 %] [% IF logged_in_user.can_see_patron_infos( overdueloo.patron ) %] - [% IF ( overdueloo.email ) %][email][% END %] + [% IF ( overdueloo.email ) %][email][% END %] [% IF ( overdueloo.phone ) %]([% overdueloo.phone | html %])[% ELSIF ( overdueloo.mobile ) %]([% overdueloo.mobile | html %])[% ELSIF ( overdueloo.phonepro ) %]([% overdueloo.phonepro | html %])[% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt index 3eb34e8a832..15b0db4c3e8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt @@ -1,4 +1,5 @@ [% USE raw %] +[% USE EmailHeader %] [% USE Asset %] [% USE Koha %] [% USE KohaDates %] @@ -81,7 +82,7 @@ [% IF ( reser.patron.notice_email_address ) %]
[% BLOCK subject %]Hold:[% END %] - + [% reser.patron.notice_email_address | html %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt index b9c051d67cd..f2f399cb7bd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt @@ -6,6 +6,7 @@ [% USE Branches %] [% USE AuthorisedValues %] [% USE TablesSettings %] +[% USE EmailHeader %] [% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] @@ -233,7 +234,7 @@

[% itemsloo.patron.phone | html %]

[% IF itemsloo.patron.notice_email_address %]

- + [% itemsloo.patron.notice_email_address | html %]

[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt index a2adf81e9b8..d8eb9469613 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/recalls_waiting.tt @@ -2,6 +2,7 @@ [% USE Koha %] [% USE KohaDates %] [% USE Asset %] +[% USE EmailHeader %] [% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] @@ -74,7 +75,7 @@ [% recall.patron.firstname | html %] [% recall.patron.surname | html %] [% IF ( recall.patron.phone ) %]
[% recall.patron.phone | html %][% END %] - [% IF ( recall.patron.email ) %]
[% recall.patron.email | html %][% END %] + [% IF ( recall.patron.email ) %]
[% recall.patron.email | html %][% END %] [% recall.library.branchname | html %] @@ -119,7 +120,7 @@ [% recall.patron.firstname | html %] [% recall.patron.surname | html %] [% IF ( recall.patron.phone ) %]
[% recall.patron.phone | html %][% END %] - [% IF ( recall.patron.email ) %]
[% recall.patron.email | html %][% END %] + [% IF ( recall.patron.email ) %]
[% recall.patron.email | html %][% END %] [% recall.library.branchname | html %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt index b77a00417cd..759350d50bb 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -8,6 +8,7 @@ [% USE AuthorisedValues %] [% USE KohaPlugins %] [% USE SafeURL %] +[% USE EmailHeader %] [% SET TagsShowEnabled = ( ( Koha.Preference( 'TagsEnabled' ) == 1 ) && TagsShowOnDetail ) %] [% SET TagsInputEnabled = ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'TagsEnabled' ) == 1 ) && TagsInputOnDetail ) %] [% SET CoverImagePlugins = KohaPlugins.get_plugins_opac_cover_images %] @@ -1095,7 +1096,7 @@ [% CASE "linkedin" -%]
[% CASE "email" -%] -
+
[% END # /SWITCH network -%] [% END # /FOREACH network %] -- 2.48.1