Bugzilla – Attachment 82922 Details for
Bug 21947
Filtering order generates html in notes
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21947: Address other misordered FILTER lines
Bug-21947-Address-other-misordered-FILTER-lines.patch (text/plain), 7.96 KB, created by
Jonathan Druart
on 2018-12-06 16:38:18 UTC
(
hide
)
Description:
Bug 21947: Address other misordered FILTER lines
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2018-12-06 16:38:18 UTC
Size:
7.96 KB
patch
obsolete
>From f4d0d2fe0e38c747e9baa17f796db903fad67a2d Mon Sep 17 00:00:00 2001 >From: Mark Tompsett <mtompset@hotmail.com> >Date: Wed, 5 Dec 2018 03:44:25 +0000 >Subject: [PATCH] Bug 21947: Address other misordered FILTER lines > >As per comment #3, this patch changes the order for all >the filters found with the recommended git grep. > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 4 ++-- > koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt | 2 +- > .../intranet-tmpl/prog/en/modules/serials/subscription-detail.tt | 8 ++++---- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 4 ++-- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt | 4 ++-- > 5 files changed, 11 insertions(+), 11 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >index cb2182a65a..bfab7727aa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -633,7 +633,7 @@ > [% IF MARCNOTE.marcnote.match('^https?://\S+$') %] > <a href="[% MARCNOTE.marcnote | url %]">[% MARCNOTE.marcnote | html %]</a> > [% ELSE %] >- [% MARCNOTE.marcnote FILTER html_line_break | html %] >+ [% MARCNOTE.marcnote | html | html_line_break %] > [% END %] > </p> > [% END %] >@@ -659,7 +659,7 @@ > [% END %] > [% IF ( subscription.closed ) %]<p>This subscription is closed.</p>[% END %] > [% IF ( subscription.callnumber ) %]<p>Callnumber: [% subscription.callnumber | html %] </p>[% END %] >- [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes FILTER html_line_break | html %] </p>[% END %] >+ [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes | html | html_line_break %] </p>[% END %] > [% IF ( subscription.missinglist ) %]<p>Missing issues: [% subscription.missinglist | html %] </p>[% END %] > [% IF ( subscription.librariannote ) %]<p>([% subscription.librariannote | html %])</p>[% END %] > [% IF ( subscription.latestserials ) %] >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 a26d5f0f74..84bd4554de 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >@@ -44,7 +44,7 @@ > <td> > <a class="notice-title" data-noticeid="[% QUEUED_MESSAGE.message_id | html %]" href="#">[% QUEUED_MESSAGE.subject | html %]</a> > <div id="notice[% QUEUED_MESSAGE.message_id | html %]" class="notice"> >- <iframe srcdoc="[% QUEUED_MESSAGE.content FILTER html_line_break | html %]"></iframe> >+ <iframe srcdoc="[% QUEUED_MESSAGE.content | html | html_line_break %]"></iframe> > </div> > </td> > <td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >index 5d935e93db..9f14fbbfb4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >@@ -336,10 +336,10 @@ > <li><span class="label">History end date:</span> [% histenddate | html %]</li> > <li><span class="label">Received issues:</span>[% recievedlist | html %]</li> > <li><span class="label">Missing issues:</span>[% missinglist | html %]</li> >- <li><span class="label">Nonpublic note:</span>[% internalnotes FILTER html_line_break | html %]</li> >- <li><span class="label">Public note:</span>[% notes FILTER html_line_break | html %]</li> >- <li><span class="label">History staff note:</span>[% librariannote FILTER html_line_break | html %]</li> >- <li><span class="label">History OPAC note:</span>[% opacnote FILTER html_line_break | html %]</li> >+ <li><span class="label">Nonpublic note:</span>[% internalnotes | html | html_line_break %]</li> >+ <li><span class="label">Public note:</span>[% notes | html | html_line_break %]</li> >+ <li><span class="label">History staff note:</span>[% librariannote | html | html_line_break %]</li> >+ <li><span class="label">History OPAC note:</span>[% opacnote | html | html_line_break %]</li> > </ol> > </div> > </div> >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 331d3076d6..4c3641b78f 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >@@ -811,7 +811,7 @@ > <p class="subscription_callnumber">Call number: [% subscription.callnumber | html %]</p> > [% END %] > [% IF ( subscription.subscriptionnotes ) %] >- <p class="subscription_notes">[% subscription.subscriptionnotes FILTER html_line_break | html %] </p> >+ <p class="subscription_notes">[% subscription.subscriptionnotes | html | html_line_break %] </p> > [% END %] > <p class="subscription_dates">Subscription from: [% subscription.histstartdate | $KohaDates %] to:[% IF ( subscription.histenddate ) %] [% subscription.histenddate | $KohaDates %] [% ELSE %] now (current)[% END %]</p> > [% IF ( subscription.letter ) %]<span class="email_notifications"> >@@ -829,7 +829,7 @@ > <p class="subscription_missing">Missing issues: [% subscription.missinglist | html %] </p> > [% END %] > [% IF ( subscription.opacnote ) %] >- <p class="subscription_opacnote">[% subscription.opacnote FILTER html_line_break | html %]</p> >+ <p class="subscription_opacnote">[% subscription.opacnote | html | html_line_break %]</p> > [% END %] > [% IF ( subscription.latestserials ) %] > <p class="subscription_latestissues"> The [% subscription.opacdisplaycount | html %] latest issues for this subscription:</p> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt >index 9733a327b8..c416dab05f 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt >@@ -115,7 +115,7 @@ > <h4>[% subscription_LOO.branchname | html %]</h4> > > [% IF ( subscription_LOO.notes ) %] >- <p>[% subscription_LOO.notes FILTER html_line_break | html %]</p> >+ <p>[% subscription_LOO.notes | html | html_line_break %]</p> > [% END %] > > [% IF ( subscription_LOO.recievedlist ) %] >@@ -131,7 +131,7 @@ > [% IF ( subscription_LOO.opacnote ) %] > <h5>Issues summary</h5> > <p> >- [% subscription_LOO.opacnote FILTER html_line_break | html %] >+ [% subscription_LOO.opacnote | html | html_line_break %] > </p> > [% END %] > [% IF ( subscription_LOO.letter ) %] >-- >2.11.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 21947
:
82850
|
82857
|
82861
|
82862
|
82921
| 82922