From 091823d8a5f65964dd1435c12d3519b56c3fcf51 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 11 Feb 2025 21:17:17 +0000 Subject: [PATCH] Bug 38664: Fix xt/author/valid-templates.t There was a missing END in basket/basket.tt (it should have been raised by the tidy that something wrong happened, to investigate later) The branch-selector change is a trick to make the test pass, or it fails with: # undef error - WHILE loop terminated (> 1000 iterations) --- .../prog/en/includes/branch-selector.inc | 2 +- .../prog/en/modules/basket/basket.tt | 556 +++++++++--------- 2 files changed, 279 insertions(+), 279 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc index 19ad580dc5a..3f703966d5b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc @@ -3,7 +3,7 @@

Select all | Clear all

- [% SET branches_for_loop = branches.hash(1).keys.nsort %][%# Do not modify the original variable 'branches' %] + [% SET branches_for_loop = branches.hash(1).keys.nsort || [] %][%# Do not modify the original variable 'branches' %] [% WHILE branches_for_loop.size > 0 %]
[% FOREACH i IN branches_for_loop.splice(0, 4) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt index d39795a4dbf..8e45efd9b44 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt @@ -39,325 +39,325 @@ [% WRAPPER 'main-container.inc' wide_centered => 1 %] +
+

Your cart

-
-

Your cart

+
+ [% IF ( verbose ) %] + Brief display + [% ELSE %] + More details + [% END %] + + Send +
+ Download + +
+ Print + Empty and close + Hide window +
-
[% IF ( verbose ) %] - Brief display - [% ELSE %] - More details - [% END %] + [% PROCESS controls %] +
+ [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %] +

+ + [% INCLUDE 'biblio-title.inc' biblio=BIBLIO_RESULT %] + [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author | html %][% END %] +

+ + - Send -
- Download - -
- Print - Empty and close - Hide window -
+
+ + [% IF ( BIBLIO_RESULT.isbn ) %] + + + + + [% END %] - [% IF ( verbose ) %] - [% PROCESS controls %] - - [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %] -

- - [% INCLUDE 'biblio-title.inc' biblio=BIBLIO_RESULT %] - [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author | html %][% END %] -

- - + [% IF ( BIBLIO_RESULT.HASAUTHORS ) %] + + + + + [% END %] -
-
ISBN[% BIBLIO_RESULT.isbn | html %]
Author(s) + [% IF ( BIBLIO_RESULT.author ) %] +

[% BIBLIO_RESULT.author | html %]

+ [% END %] + [% IF ( BIBLIO_RESULT.MARCAUTHORS ) %] + [% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %] +

+ [% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %] + [% MARCAUTHOR_SUBFIELDS_LOO.separator | html %] + [% MARCAUTHOR_SUBFIELDS_LOO.value | html %] + [% END %] +

+ [% END %] + [% END %] +
- [% IF ( BIBLIO_RESULT.isbn ) %] - - - - - [% END %] + [% IF ( BIBLIO_RESULT.publishercode ) %] + + + + + [% END %] - [% IF ( BIBLIO_RESULT.HASAUTHORS ) %] - - - + + + + [% END %] + + [% IF ( BIBLIO_RESULT.seriestitle ) %] + + + + + [% END %] + + [% IF ( BIBLIO_RESULT.MARCSUBJCTS ) %] + + + - - [% END %] + + + [% END %] - [% IF ( BIBLIO_RESULT.publishercode ) %] - - - - - [% END %] + [% IF ( BIBLIO_RESULT.copyrightdate ) %] + + + + [% END %] - [% IF ( BIBLIO_RESULT.pages ) %] - - - - - [% END %] + [% IF ( BIBLIO_RESULT.MARCNOTES ) %] + + + + + [% END %] - [% IF ( BIBLIO_RESULT.seriestitle ) %] - - - - - [% END %] + [% IF ( BIBLIO_RESULT.unititle ) %] + + + + + [% END %] - [% IF ( BIBLIO_RESULT.MARCSUBJCTS ) %] - - - - - [% END %] + [% IF ( BIBLIO_RESULT.serial ) %] + + + + + [% END %] - [% IF ( BIBLIO_RESULT.copyrightdate ) %] - - - - [% END %] + [% IF ( BIBLIO_RESULT.dewey ) %] + + + + + [% END %] - [% IF ( BIBLIO_RESULT.MARCNOTES ) %] - - - - - [% END %] + [% IF ( BIBLIO_RESULT.classification ) %] + + + + + [% END %] - [% IF ( BIBLIO_RESULT.unititle ) %] - - - - - [% END %] + [% IF ( BIBLIO_RESULT.lccn ) %] + + + + + [% END %] - [% IF ( BIBLIO_RESULT.serial ) %] - - - - - [% END %] + [% IF BIBLIO_RESULT.MARCURLS.size %] + + + + + [% END %] - [% IF ( BIBLIO_RESULT.dewey ) %] - - - - - [% END %] + [% IF BIBLIO_RESULT.HOSTITEMENTRIES || BIBLIO_RESULT.HOSTINFO %] + + + + + [% END %] - [% IF ( BIBLIO_RESULT.classification ) %] - - + + - [% END %] +
ISBN[% BIBLIO_RESULT.isbn | html %]
Publisher[% BIBLIO_RESULT.place | html %] [% BIBLIO_RESULT.publishercode | html %] [% BIBLIO_RESULT.publicationyear | html %]
Author(s) - [% IF ( BIBLIO_RESULT.author ) %] -

[% BIBLIO_RESULT.author | html %]

- [% END %] - [% IF ( BIBLIO_RESULT.MARCAUTHORS ) %] - [% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %] + [% IF ( BIBLIO_RESULT.pages ) %] +
Details[% BIBLIO_RESULT.pages | html %] [% BIBLIO_RESULT.illus | html %] [% BIBLIO_RESULT.item('size') | html %]
Collection [% BIBLIO_RESULT.seriestitle | html %]
Subject(s) + [% FOREACH MARCSUBJCT IN BIBLIO_RESULT.MARCSUBJCTS %]

- [% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %] - [% MARCAUTHOR_SUBFIELDS_LOO.separator | html %] - [% MARCAUTHOR_SUBFIELDS_LOO.value | html %] + [% FOREACH MARCSUBJECT_SUBFIELDS_LOO IN MARCSUBJCT.MARCSUBJECT_SUBFIELDS_LOOP %] + [% MARCSUBJECT_SUBFIELDS_LOO.separator | html %][% MARCSUBJECT_SUBFIELDS_LOO.value | html %] [% END %]

[% END %] - [% END %] -
Publisher[% BIBLIO_RESULT.place | html %] [% BIBLIO_RESULT.publishercode | html %] [% BIBLIO_RESULT.publicationyear | html %]
Copyright [% BIBLIO_RESULT.copyrightdate | html %]
Details[% BIBLIO_RESULT.pages | html %] [% BIBLIO_RESULT.illus | html %] [% BIBLIO_RESULT.item('size') | html %]
Notes + [% FOREACH MARCNOTE IN BIBLIO_RESULT.MARCNOTES %] +

+ [% IF MARCNOTE.marcnote.match('^https?://\S+$') %] + - [% MARCNOTE.marcnote | html %] + [% ELSE %] + - [% MARCNOTE.marcnote | html %] + [% END %] +

+ [% END %] +
Collection [% BIBLIO_RESULT.seriestitle | html %]
Unified title [% BIBLIO_RESULT.unititle | html %]
Subject(s) - [% FOREACH MARCSUBJCT IN BIBLIO_RESULT.MARCSUBJCTS %] -

- [% FOREACH MARCSUBJECT_SUBFIELDS_LOO IN MARCSUBJCT.MARCSUBJECT_SUBFIELDS_LOOP %] - [% MARCSUBJECT_SUBFIELDS_LOO.separator | html %][% MARCSUBJECT_SUBFIELDS_LOO.value | html %] - [% END %] -

- [% END %] -
Serial[% BIBLIO_RESULT.serial | html %]
Copyright [% BIBLIO_RESULT.copyrightdate | html %]
Dewey[% BIBLIO_RESULT.dewey | html %]
Notes - [% FOREACH MARCNOTE IN BIBLIO_RESULT.MARCNOTES %] -

- [% IF MARCNOTE.marcnote.match('^https?://\S+$') %] - - [% MARCNOTE.marcnote | html %] - [% ELSE %] - - [% MARCNOTE.marcnote | html %] - [% END %] -

- [% END %] -
Classification [% BIBLIO_RESULT.classification | html %]
Unified title [% BIBLIO_RESULT.unititle | html %]
LCCN [% BIBLIO_RESULT.lccn | html %]
Serial[% BIBLIO_RESULT.serial | html %]
URL(s) + [% FOREACH MARCurl IN BIBLIO_RESULT.MARCURLS %] + [% IF MARCurl.part %]

[% MARCurl.part | html %]

[% END %] + [% MARCurl.linktext | html %] + [% IF MARCurl.notes %] + [% FOREACH note IN MARCurl.notes %] +

[% note.note | html %]

+ [% END %] + [% END %] + [% END %] +
Dewey[% BIBLIO_RESULT.dewey | html %]
In + [% IF BIBLIO_RESULT.HOSTITEMENTRIES %] +

[% INCLUDE 'biblio-title.inc' link = 1 biblio=BIBLIO_RESULT.HOSTITEMENTRIES %] [% BIBLIO_RESULT.RELATEDPARTS | html %]

+ [% ELSE %] +

[% BIBLIO_RESULT.HOSTINFO | html %]

+ [% END %] +
Classification [% BIBLIO_RESULT.classification | html %]Location(s) + [% IF BIBLIO_RESULT.ITEM_RESULTS.count %] + [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %] +

+ [% Branches.GetName(ITEM_RESULT.holdingbranch) | html %] + [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ITEM_RESULT.location ) | html %] + [% IF ( ITEM_RESULT.itemcallnumber ) %] + ([% ITEM_RESULT.itemcallnumber | html %]) + [% END %] +

+ [% END %] + [% ELSE %] + This record has no items. + [% END %] +
+
+ [% END # /FOREACH BIBLIO_RESULT %] + + [%# /bookbag_form %] + [% ELSE # IF verbose %] +
+ [% PROCESS controls %] - [% IF ( BIBLIO_RESULT.lccn ) %] +
+ + - - + + + + - [% END %] + - [% IF BIBLIO_RESULT.MARCURLS.size %] + [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %] - + - - [% END %] - - [% IF BIBLIO_RESULT.HOSTITEMENTRIES || BIBLIO_RESULT.HOSTINFO %] - - - + - [% END %] - - - - - + [% END # /FOREACH BIBLIO_RESULT %]
LCCN [% BIBLIO_RESULT.lccn | html %] TitleItem type + Items +
URL(s) + + - [% FOREACH MARCurl IN BIBLIO_RESULT.MARCURLS %] - [% IF MARCurl.part %]

[% MARCurl.part | html %]

[% END %] - [% MARCurl.linktext | html %] - [% IF MARCurl.notes %] - [% FOREACH note IN MARCurl.notes %] -

[% note.note | html %]

+ [% INCLUDE 'biblio-title.inc' biblio=BIBLIO_RESULT link = 1 %] + [% BIBLIO_RESULT.author | html %] +

+ [% IF ( BIBLIO_RESULT.publishercode ) %] + - [% BIBLIO_RESULT.publishercode | html %] + [% IF ( BIBLIO_RESULT.place ) %] + [% BIBLIO_RESULT.place | html %] + [% END %] + [% END %] + [% IF ( BIBLIO_RESULT.pages ) %] + - [% BIBLIO_RESULT.pages | html %] + [% IF ( BIBLIO_RESULT.item('size') ) %] + [% BIBLIO_RESULT.item('size') | html %] [% END %] [% END %] +

+ [% IF ( BIBLIO_RESULT.notes ) %] +

[% BIBLIO_RESULT.notes | html %]

+ [% END %] + [% IF BIBLIO_RESULT.HOSTITEMENTRIES || BIBLIO_RESULT.HOSTINFO %] +

In: + [% IF BIBLIO_RESULT.HOSTITEMENTRIES %] + [% INCLUDE 'biblio-title.inc' link = 1 biblio=BIBLIO_RESULT.HOSTITEMENTRIES %] + [% BIBLIO_RESULT.RELATEDPARTS | html %] + [% ELSE %] + [% BIBLIO_RESULT.HOSTINFO | html %] + [% END %] +

[% END %] + +
In - [% IF BIBLIO_RESULT.HOSTITEMENTRIES %] -

[% INCLUDE 'biblio-title.inc' link = 1 biblio=BIBLIO_RESULT.HOSTITEMENTRIES %] [% BIBLIO_RESULT.RELATEDPARTS | html %]

+
[% BIBLIO_RESULT.description | html %] + [% IF ( BIBLIO_RESULT.ITEM_RESULTS ) %] + [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %] +
+ + + [% ITEM_RESULT.itemcallnumber | html %] + + [% Branches.GetName(ITEM_RESULT.holdingbranch) | html %] + [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ITEM_RESULT.location ) | html %] + +
+ [% END %] [% ELSE %] -

[% BIBLIO_RESULT.HOSTINFO | html %]

+ This record has no items. [% END %]
Location(s) - [% IF BIBLIO_RESULT.ITEM_RESULTS.count %] - [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %] -

- [% Branches.GetName(ITEM_RESULT.holdingbranch) | html %] - [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ITEM_RESULT.location ) | html %] - [% IF ( ITEM_RESULT.itemcallnumber ) %] - ([% ITEM_RESULT.itemcallnumber | html %]) - [% END %] -

- [% END %] - [% ELSE %] - This record has no items. - [% END %] -
- [% END # /FOREACH BIBLIO_RESULT %] -
- [%# /bookbag_form %] - [% ELSE # IF verbose %] -
- [% PROCESS controls %] +
+ [% END # /IF verbose %] -
- - - - - - - - - - - [% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %] - - - - - - - [% END # /FOREACH BIBLIO_RESULT %] -
 TitleItem type - Items -
- - - [% INCLUDE 'biblio-title.inc' biblio=BIBLIO_RESULT link = 1 %] - [% BIBLIO_RESULT.author | html %] -

- [% IF ( BIBLIO_RESULT.publishercode ) %] - - [% BIBLIO_RESULT.publishercode | html %] - [% IF ( BIBLIO_RESULT.place ) %] - [% BIBLIO_RESULT.place | html %] - [% END %] - [% END %] - [% IF ( BIBLIO_RESULT.pages ) %] - - [% BIBLIO_RESULT.pages | html %] - [% IF ( BIBLIO_RESULT.item('size') ) %] - [% BIBLIO_RESULT.item('size') | html %] - [% END %] - [% END %] -

- [% IF ( BIBLIO_RESULT.notes ) %] -

[% BIBLIO_RESULT.notes | html %]

- [% END %] - [% IF BIBLIO_RESULT.HOSTITEMENTRIES || BIBLIO_RESULT.HOSTINFO %] -

In: - [% IF BIBLIO_RESULT.HOSTITEMENTRIES %] - [% INCLUDE 'biblio-title.inc' link = 1 biblio=BIBLIO_RESULT.HOSTITEMENTRIES %] - [% BIBLIO_RESULT.RELATEDPARTS | html %] - [% ELSE %] - [% BIBLIO_RESULT.HOSTINFO | html %] - [% END %] -

- [% END %] - - -
[% BIBLIO_RESULT.description | html %] - [% IF ( BIBLIO_RESULT.ITEM_RESULTS ) %] - [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %] -
- - - [% ITEM_RESULT.itemcallnumber | html %] - - [% Branches.GetName(ITEM_RESULT.holdingbranch) | html %] - [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => ITEM_RESULT.location ) | html %] - -
- [% END %] - [% ELSE %] - This record has no items. - [% END %] -
-
+
+
- [% END # /IF verbose %] - -
- -
-
-[%# /.container %] +
+ [%# /.container %] +[% END %] [% INCLUDE 'intranet-bottom.inc' popup_window=1 %] [% INCLUDE 'datatables.inc' %] -- 2.34.1