From c5d4ba8cc901d0c1d4993b1e25f0048baf385fe7 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 21 Sep 2023 14:13:22 +0200 Subject: [PATCH] Bug 34862: Remove blocking_errors where there is no main Signed-off-by: Owen Leonard --- .../intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc | 1 - .../intranet-tmpl/prog/en/includes/authorities-toolbar.inc | 1 - .../intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc | 1 - koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc | 1 - koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc | 1 - koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc | 1 - koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc | 1 - koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc | 1 - .../intranet-tmpl/prog/en/includes/patroncards-toolbar.inc | 1 - koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc | 1 - .../prog/en/includes/rotating-collections-toolbar.inc | 1 - koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc | 1 - .../intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc | 2 -- .../intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt | 1 - koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt | 1 - koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt | 2 -- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt | 2 -- .../en/modules/admin/searchengine/elasticsearch/mappings.tt | 2 -- koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt | 1 - koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt | 2 -- koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt | 1 - .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 1 - koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt | 1 - .../intranet-tmpl/prog/en/modules/serials/subscription-add.tt | 2 -- .../intranet-tmpl/prog/en/modules/suggestion/suggestion.tt | 2 -- .../intranet-tmpl/prog/en/modules/tools/import_borrowers.tt | 1 - koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt | 1 - 27 files changed, 34 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc index 1dfd5955ab..6e21f70ce4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc @@ -1,4 +1,3 @@ -[% INCLUDE 'blocking_errors.inc' %]
[% IF ( booksellerid ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc index 58b7ca715e..688c150f22 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc @@ -1,4 +1,3 @@ -[% INCLUDE 'blocking_errors.inc' %] [% IF ( authid || CAN_user_editauthorities) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc index 5b5c3e0343..9389511a58 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc @@ -1,4 +1,3 @@ -[% INCLUDE 'blocking_errors.inc' %]
[% IF ( budget_period_id ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc index 93818826d2..8bae438519 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -1,6 +1,5 @@ [% USE Context %] [% USE Biblio %] -[% INCLUDE 'blocking_errors.inc' %]
[% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items || CAN_user_serials_create_subscription || Koha.Preference('CatalogConcerns') ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc index 9312ae0525..ad219397b9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc @@ -1,4 +1,3 @@ -[% INCLUDE 'blocking_errors.inc' %] [% USE Koha %] [% IF Koha.Preference('ILLModule') && CAN_user_ill %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc index e2d441ca5b..c0e5770843 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc @@ -1,4 +1,3 @@ -[% INCLUDE 'blocking_errors.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc index d071106060..dcf3eab648 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -1,4 +1,3 @@ -[% INCLUDE 'blocking_errors.inc' %] [% USE Koha %] [% USE Branches %] [% USE Categories %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc index 03595cb507..8b6abc7bc1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc @@ -1,4 +1,3 @@ -[% INCLUDE 'blocking_errors.inc' %] [% USE Categories %] [% USE Koha %] [% SET categories = Categories.limited %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc index 46c1f3c5ed..52b55482e9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc @@ -1,4 +1,3 @@ -[% INCLUDE 'blocking_errors.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc index 90bbadf1b8..41af881afb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc @@ -1,4 +1,3 @@ -[% INCLUDE 'blocking_errors.inc' %]
[% IF ( CAN_user_reports_create_reports ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc index 4cf5d8e9e2..f8f8ab552f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc @@ -1,4 +1,3 @@ -[% INCLUDE 'blocking_errors.inc' %]
New collection diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc index 1fcd1a096e..85811729dd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc @@ -1,4 +1,3 @@ -[% INCLUDE 'blocking_errors.inc' %] [% IF subscriptionid and ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_receive_serials ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc index c00b73d7c2..d498ed0ee0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc @@ -1,5 +1,3 @@ -[% INCLUDE 'blocking_errors.inc' %] -
New list
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt index e069fe6e60..b8a04f1193 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt @@ -51,7 +51,6 @@

Duplicate existing orders

-[% INCLUDE 'blocking_errors.inc' %] [% IF op == 'search' || op == 'select' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt index 9610fdd88a..e8afb5a96d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -50,7 +50,6 @@

Invoice: [% invoicenumber | html %]

- [% INCLUDE 'blocking_errors.inc' %] [% IF ( modified ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt index 7e160a8318..e88e29bde3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -36,8 +36,6 @@
- [% INCLUDE 'blocking_errors.inc' %] -

Invoices

[% IF ( do_search ) %] [% IF invoices %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt index b256882583..b259cd9c12 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -264,8 +264,6 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% INCLUDE 'blocking_errors.inc' %] -
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt index 242eae6758..eca39500c2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt @@ -32,8 +32,6 @@ a.add, a.delete { [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% INCLUDE 'blocking_errors.inc' %] -
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt index 6fe0ec6cdc..6c6ab8f8c1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt @@ -74,7 +74,6 @@ Add a new item or go to the records holdings.
[% END %] - [% INCLUDE 'blocking_errors.inc' %]

Items for [% biblio.title | html %] [% IF ( biblio.author ) %] by [% biblio.author | html %][% END %] (Record #[% biblio.biblionumber | html %])

[% IF ( barcode_not_unique ) %]
Error saving item: Barcode must be unique.
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt index 187d32224a..c87eb61eab 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt @@ -54,8 +54,6 @@ [% END %] -[% INCLUDE 'blocking_errors.inc' %] -

Barcode [% barcode | html %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt index 18c32347fd..e2cab866b8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt @@ -88,7 +88,6 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% INCLUDE 'blocking_errors.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index 88df5fe58d..fbdaa65711 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -85,7 +85,6 @@ legend:hover {
[% END %]
- [% INCLUDE 'blocking_errors.inc' %] [% IF error_alert %] [% IF ( error_alert == "no_email" ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt index e74b373f74..43565208cc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt @@ -41,7 +41,6 @@

Edit routing list for [% title | html %]

[% END %] -[% INCLUDE 'blocking_errors.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt index 19d53a1c33..10b7536775 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt @@ -46,8 +46,6 @@ fieldset.rows table { clear: none; margin: 0; } [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% INCLUDE 'blocking_errors.inc' %] -
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt index 657a2a5cbd..c4439f0ba6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -89,8 +89,6 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] - [% INCLUDE 'blocking_errors.inc' %] - [% IF ( op == 'show' ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt index 0ea592976e..4fa3e23ee4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt @@ -46,7 +46,6 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% INCLUDE 'blocking_errors.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt index bf55d2ec5c..a0897d8905 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt @@ -40,7 +40,6 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -[% INCLUDE 'blocking_errors.inc' %]
-- 2.30.2