From 77c31b900d1edbc765dd979b6c3ed03745708f37 Mon Sep 17 00:00:00 2001
From: Andreas Roussos <a.roussos@dataly.gr>
Date: Mon, 1 Jul 2024 14:27:42 +0000
Subject: [PATCH] Bug 37226: append a random number to the `id` attribute of
 each <li>

When you view the authority details page for a term that contains more
than one terms with broader relationship, clicking on the expand/collapse
arrows next to the top-level terms in the hierarchy tree will not work
properly, i.e. *only one* broader term will show the narrower term under
it at any given time.

This is affecting both the OPAC and the Staff interface.

This is happening because in the HTML source of the page the individual
<li> elements associated with each node do not have unique `id` values,
which confuses the JavaScript library (jsTree) responsible for rendering
the hierarchy tree.

This patch fixes that by appending a random number to each `id` attribute.

Test plan:

0) Enable the AuthDisplayHierarchy System Preference (set to 'Show').

1) Copy the provided MARC21 Authority sample data (sample-data.mrc)
   to your KTD Koha container (it must have MARC21 marc flavour):

   docker cp sample-data.mrc koha-koha-1:/kohadevbox/

2) Import the provided authorities (the sample file contains three
   Geographic Name records):

   WARNING! the --delete switch is passed to bulkmarcimport.pl
   WARNING! this will erase any authority data you have in your instance!
   (this is done to retain the broader/narrower authid associations)

   misc/migration_tools/bulkmarcimport.pl --authorities --file=/kohadevbox/sample-data.mrc --verbose -c=MARC21 --delete -m=ISO2709

3) Visit the authority details page for 'Athens' in OPAC/Staff:

   http://localhost:8080/cgi-bin/koha/opac-authoritiesdetail.pl?authid=3
   http://localhost:8081/cgi-bin/koha/authorities/detail.pl?authid=3

   In the authority hierarchy tree, click the arrows next to 'Europe'
   and 'Greece' to expand and show the narrower term: notice how only
   one item works at any given time.

4) Apply the patch.

5) Repeat step 3) (refresh the pages) -- this time you should be able
   to view 'Athens' as a narrower term of both 'Europe' and 'Greece'
   at the same time.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 24e54b1fd4b241a0d5723ff7ec97b2fe9645d577)
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 8add61d7f379b966c1dafc30a499a9267a567fd7)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/authorities.inc       | 3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities.inc
index 1e37b65c7f..12926ed8f6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities.inc
@@ -1,3 +1,4 @@
+[% USE Math %]
 [% BLOCK showhierarchy %]
     [% FOREACH tree IN trees %]
         [% PROCESS showtree tree = tree %]
@@ -6,7 +7,7 @@
 [% BLOCK showtree %]
     <ul class="hierarchy">
         [% FOREACH node IN tree %]
-            <li id="hier[% node.authid | html %]" class="[% node.class | html %] authnode">
+            <li id="hier[% node.authid | html %]_[% Math.rand( 1 ).remove( '\.' ) | html %]" class="[% node.class | html %] authnode">
             [% IF ( node.current_value ) %]
                 <span class='currentauth'>[% node.value | html %]</span>
             [% ELSE %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc
index 2bbad1a9e3..fcf74b31dc 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc
@@ -1,3 +1,4 @@
+[% USE Math %]
 [% BLOCK showhierarchy %]
     [% FOREACH tree IN trees %]
         [% PROCESS showtree tree = tree marc = marc %]
@@ -7,7 +8,7 @@
 [% BLOCK showtree %]
     <ul class="hierarchy">
         [% FOREACH node IN tree %]
-            <li id="hier[% node.authid | html %]" class="[% node.class | html %] authnode">
+            <li id="hier[% node.authid | html %]_[% Math.rand( 1 ).remove( '\.' ) | html %]" class="[% node.class | html %] authnode">
             [% IF ( node.current_value ) %]
                 <span class="currentauth">[% node.value | html %]</span>
             [% ELSE %]
-- 
2.39.5