From 7502f4182e450a60017a5aacfccd8c411dc99c30 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Fri, 22 Oct 2021 10:15:45 +0200
Subject: [PATCH] Bug 11175: Uniformize ComponentParts in template

More robust as it takes empty array into account

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../intranet-tmpl/prog/en/modules/catalogue/detail.tt     | 8 ++++----
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt   | 8 ++++----
 2 files changed, 8 insertions(+), 8 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 3aedb27d95..684a082ffa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -269,7 +269,7 @@
         </li>
     [% END %]
 [% IF ( MARCNOTES || notes ) %]<li><a href="#description">Descriptions ([% ( MARCNOTES.size || 1 ) | html %])</a></li>[% END %]
-[% IF ( ComponentParts ) %]<li id="components_tab"><a href="#components">Components ([% ( ComponentParts.size ) %])</a></li>[% END %]
+[% IF ComponentParts && ComponentParts.size %]<li id="components_tab"><a href="#components">Components ([% ComponentParts.size | html %])</a></li>[% END %]
 [% IF ( subscriptionsnumber ) %]<li><a href="#subscriptions">Subscriptions</a></li>[% END %]
 [% IF Koha.Preference('AcquisitionDetails') %]<li><a href="#acq_details">Acquisition details</a></li>[% END %]
 [% IF suggestions.count %]<li><a href="#suggestion_details">Suggestion details</a></li>[% END %]
@@ -675,7 +675,7 @@ Note that permanent location is a code, and location may be an authval.
 
 [% END %]
 
-[% IF ComponentParts.size %]
+[% IF ComponentParts && ComponentParts.size %]
 <div id="components">
     <div class="content_set">
         <table>
@@ -688,7 +688,7 @@ Note that permanent location is a code, and location may be an authval.
             [% END %]
         </table>
         [% IF ComponentParts.size == Koha.Preference('MaxComponentRecords')%]
-        <p>Only [% ComponentParts.size %] results are shown: <a href="/cgi-bin/koha/catalogue/search.pl?q=[% ComponentPartsQuery | uri %]"/>show all component parts</a></p>
+        <p>Only [% ComponentParts.size | html %] results are shown: <a href="/cgi-bin/koha/catalogue/search.pl?q=[% ComponentPartsQuery | uri %]"/>show all component parts</a></p>
         [% END %]
 </div>
 
@@ -1264,7 +1264,7 @@ Note that permanent location is a code, and location may be an authval.
             [% IF count == 0 %]
                 [% IF ( Koha.Preference('HTML5MediaEnabled') == 'staff' or Koha.Preference('HTML5MediaEnabled') == 'both' ) && HTML5MediaSets.size %]
                     $('#bibliodetails').tabs("option", "active", $('#media_tab').index() );
-                [% ELSIF ComponentParts %]
+                [% ELSIF ComponentParts && ComponentParts.size %]
                     $('#bibliodetails').tabs("option", "active", $('#components_tab').index() );
                 [% END %]
             [% END %]
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 caa937813d..f38ea4e0f2 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@ -402,13 +402,13 @@
                             [% IF SYNDETICS_SUMMARY %][% SET title_notes_count = title_notes_count + 1 %][% END %]
                             <li id="tab_descriptions"> <a href="#descriptions">Title notes ( [% title_notes_count | html %] )</a></li>
                         [% END %]
-                        [% IF ( ComponentParts ) %]
+                        [% IF ComponentParts && ComponentParts.size %]
                             [% IF defaulttab == 'components' %]
                             <li id="tab_components" class="ui-tabs-active">
                             [% ELSE %]
                             <li id="tab_components">
                             [% END %]
-                                <a href="#components">Components ([% ( ComponentParts.size ) %])</a>
+                                <a href="#components">Components ([% ComponentParts.size | html %])</a>
                             </li>
                         [% END %]
                         [% IF ( SYNDETICS_TOC ) %]
@@ -593,7 +593,7 @@
                         </div> <!-- / #descriptions -->
                     [% END # / IF MARCNOTES || notes %]
 
-                    [% IF ComponentParts.size %]
+                    [% IF ComponentParts && ComponentParts.size %]
                     <div id="components">
                         <div class="content_set">
                             <table>
@@ -606,7 +606,7 @@
                                 [% END %]
                             </table>
                             [% IF ComponentParts.size == Koha.Preference('MaxComponentRecords')%]
-                            <p>Only [% ComponentParts.size %] results are shown: <a href="/cgi-bin/koha/opac-search.pl?q=[% ComponentPartsQuery | uri %]"/>show all component parts</a></p>
+                            <p>Only [% ComponentParts.size | html %] results are shown: <a href="/cgi-bin/koha/opac-search.pl?q=[% ComponentPartsQuery | uri %]"/>show all component parts</a></p>
                             [% END %]
                         </div>
                     </div>
-- 
2.39.5