From f97bd325a8ef617caedbf894a806ac5319d18836 Mon Sep 17 00:00:00 2001 From: Mark Tompsett 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 Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 30874dea519d379134174cf9c5fd5051588a8629) Signed-off-by: Martin Renvoize --- .../intranet-tmpl/prog/en/modules/catalogue/detail.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/members/notices.tt | 2 +- .../prog/en/modules/serials/subscription-detail.tt | 8 ++++---- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 4 ++-- .../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+$') %] [% MARCNOTE.marcnote | html %] [% ELSE %] - [% MARCNOTE.marcnote FILTER html_line_break | html %] + [% MARCNOTE.marcnote | html | html_line_break %] [% END %]

[% END %] @@ -659,7 +659,7 @@ [% END %] [% IF ( subscription.closed ) %]

This subscription is closed.

[% END %] [% IF ( subscription.callnumber ) %]

Callnumber: [% subscription.callnumber | html %]

[% END %] - [% IF ( subscription.subscriptionnotes ) %]

[% subscription.subscriptionnotes FILTER html_line_break | html %]

[% END %] + [% IF ( subscription.subscriptionnotes ) %]

[% subscription.subscriptionnotes | html | html_line_break %]

[% END %] [% IF ( subscription.missinglist ) %]

Missing issues: [% subscription.missinglist | html %]

[% END %] [% IF ( subscription.librariannote ) %]

([% subscription.librariannote | html %])

[% 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 @@ [% QUEUED_MESSAGE.subject | html %]
- +
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 @@
  • History end date: [% histenddate | html %]
  • Received issues:[% recievedlist | html %]
  • Missing issues:[% missinglist | html %]
    • -
  • Nonpublic note:[% internalnotes FILTER html_line_break | html %]
    • -
  • Public note:[% notes FILTER html_line_break | html %]
    • -
  • History staff note:[% librariannote FILTER html_line_break | html %]
    • -
  • History OPAC note:[% opacnote FILTER html_line_break | html %]
    • +
  • Nonpublic note:[% internalnotes | html | html_line_break %]
    • +
  • Public note:[% notes | html | html_line_break %]
    • +
  • History staff note:[% librariannote | html | html_line_break %]
    • +
  • History OPAC note:[% opacnote | html | html_line_break %]
    • 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 @@

    Call number: [% subscription.callnumber | html %]

    [% END %] [% IF ( subscription.subscriptionnotes ) %] -

    [% subscription.subscriptionnotes FILTER html_line_break | html %]

    +

    [% subscription.subscriptionnotes | html | html_line_break %]

    [% END %]

    Subscription from: [% subscription.histstartdate | $KohaDates %] to:[% IF ( subscription.histenddate ) %] [% subscription.histenddate | $KohaDates %] [% ELSE %] now (current)[% END %]

    [% IF ( subscription.letter ) %]