Bugzilla – Attachment 166330 Details for
Bug 35285
Centralise notice content wrapping for HTML output
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 35285: Remove switch in notices.tt
Bug-35285-Remove-switch-in-noticestt.patch (text/plain), 2.23 KB, created by
Martin Renvoize
on 2024-05-07 18:25:55 UTC
(
hide
)
Description:
Bug 35285: Remove switch in notices.tt
Filename:
MIME Type:
Creator:
Martin Renvoize
Created:
2024-05-07 18:25:55 UTC
Size:
2.23 KB
patch
obsolete
>From e6d78652df73b118d1772f2be4b2b1b96defd9b8 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Wed, 8 Nov 2023 10:43:09 +0000 >Subject: [PATCH] Bug 35285: Remove switch in notices.tt > >We now wrap appropriately for non-html formatted messages as >part of the html_content method. This means we can remove the >case from members/notices.tt and rely on html_content doing >the right thing for notice previews. > >Signed-off-by: David Nind <david@davidnind.com> >--- > koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt | 5 ----- > 1 file changed, 5 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >index 660ac5fb032..1b50af399bc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >@@ -1,6 +1,5 @@ > [% USE raw %] > [% USE Asset %] >-[% USE String %] > [% USE Koha %] > [% USE AuthorisedValues %] > [% USE Branches %] >@@ -66,11 +65,7 @@ > <tr> > <td> > <a class="notice-title" data-noticeid="[% QUEUED_MESSAGE.message_id | html %]" href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% borrowernumber | uri %]&noticeid=[% QUEUED_MESSAGE.message_id | uri %]">[% QUEUED_MESSAGE.subject | html %]</a> >- [% IF QUEUED_MESSAGE.content_type.search('html') %] > <iframe class="notice" id="notice[% QUEUED_MESSAGE.message_id | html %]" srcdoc="[% QUEUED_MESSAGE.html_content | html %]"></iframe> >- [% ELSE %] >- <iframe class="notice" id="notice[% QUEUED_MESSAGE.message_id | html %]" srcdoc="[% QUEUED_MESSAGE.content | html | html_line_break %]"></iframe> >- [% END %] > </td> > <td> > [% IF ( QUEUED_MESSAGE.message_transport_type == 'email' ) %]<span>email</span> >-- >2.45.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 35285
:
158657
|
158658
|
158889
|
158890
|
158891
|
158960
|
158961
|
158962
|
166329
|
166330
|
166331
|
166332
|
166333
|
166334
|
166348
|
166349
|
166350
|
166356
|
166357
|
166358
|
166719
|
166720
|
166721
|
166722