From 2b6cdc2ca4a1bffabe0e65463bf8af098ef9b614 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 21 Apr 2022 07:52:03 +0100 Subject: [PATCH] Bug 29602: (follow-up) Fix missing filters $KohaSpan is not seen as a filter by xt/find-missing-filters.t and thus we need to filter the block variables before passing them to $KohaSpan Signed-off-by: Martin Renvoize --- .../background_jobs/batch_authority_record_modification.inc | 4 ++-- .../background_jobs/batch_biblio_record_modification.inc | 4 ++-- .../prog/en/includes/background_jobs/batch_hold_cancel.inc | 2 +- .../includes/background_jobs/batch_item_record_deletion.inc | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_modification.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_modification.inc index d1ed00a125..867b70ddcd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_modification.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_authority_record_modification.inc @@ -29,10 +29,10 @@ [% authority_link = BLOCK %][% m.authid | html %][% END %] [% SWITCH m.code %] [% CASE 'authority_not_modified' %] - Authority record [% authority_link | $KohaSpan %] has not been modified. An error occurred on modifying it + Authority record [% authority_link | url | $KohaSpan %] has not been modified. An error occurred on modifying it [% IF m.error %] ([% m.error | html %])[% END %]. [% CASE 'authority_modified' %] - Authority record [% authority_link | $KohaSpan %] has successfully been modified. + Authority record [% authority_link | url | $KohaSpan %] has successfully been modified. [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_biblio_record_modification.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_biblio_record_modification.inc index 7315c35c84..a8942ab5fc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_biblio_record_modification.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_biblio_record_modification.inc @@ -40,10 +40,10 @@ [% biblio_link = BLOCK %][% m.biblionumber | html %][% END %] [% SWITCH m.code %] [% CASE 'biblio_not_modified' %] - Bibliographic record [% biblio_link %] has not been modified. An error occurred on modifying it. + Bibliographic record [% biblio_link | url | $KohaSpan %] has not been modified. An error occurred on modifying it. [% IF m.error %] ([% m.error | html %])[% END %]. [% CASE 'biblio_modified' %] - Bibliographic record [% biblio_link %] has successfully been modified. + Bibliographic record [% biblio_link | url | $KohaSpan %] has successfully been modified. [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_hold_cancel.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_hold_cancel.inc index 280149b7fc..abf3d5035b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_hold_cancel.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_hold_cancel.inc @@ -40,7 +40,7 @@ [% CASE 'hold_cancelled' %] [% biblio_link = BLOCK %][% m.biblio.title | html %][% END %] [% patron_link = BLOCK %][% INCLUDE 'patron-title.inc' patron=m.patron %][% END %] - Hold on [% biblio_link | $KohaSpan %] for [% patron_link | $KohaSpan %] has successfully been cancelled. + Hold on [% biblio_link | url | $KohaSpan %] for [% patron_link | url | $KohaSpan %] has successfully been cancelled. [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_item_record_deletion.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_item_record_deletion.inc index 4b552ec0c3..2bd9cd5e25 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_item_record_deletion.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_item_record_deletion.inc @@ -41,7 +41,7 @@ [% SWITCH m.code %] [% CASE 'item_not_deleted' %] [% item_link = BLOCK %][% m.barcode | html %][% END %] - Item with barcode [% item_link | $KohaSpan%] cannot be deleted: + Item with barcode [% item_link | url | $KohaSpan %] cannot be deleted: [% SWITCH m.reason %] [% CASE "book_on_loan" %]Item is checked out [% CASE "not_same_branch" %]Item does not belong to your library -- 2.20.1