From 86d608c43959f8b7311ea5f72c93f2262587a623 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 4 Jun 2018 11:23:35 -0300 Subject: [PATCH] Bug 20875: (bug 16735 follow-up) Fix library list for OpacAddMastheadLibraryPulldown This patch fixes a regression introduced by commit 2059f7d8016ab61172830e9b670279d3e28882b7 Bug 16735: Migrate library search groups into the new hierarchical groups It re-added code that was removed by bug 15758 (use of var BranchesLoop). Test plan: - Create library search groups - Turn OpacAddMastheadLibraryPulldown on - At the OPAC confirm that the search box with libraries and library groups is displayed and works correctly. - Remove the library search group - The dropdown list should not have the optgroup tags Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize --- koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc index 97b9d22218..098456301c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc @@ -224,9 +224,12 @@ [% IF LibrarySearchGroups %][% END %] - [% FOREACH BranchesLoo IN BranchesLoop %] - [% IF ( BranchesLoo.selected ) %] - [% ELSE %][% END %] + [% FOREACH library IN Branches.all( selected => opac_name ) %] + [% IF library.selected %] + + [% ELSE %] + + [% END %] [% END %] [% IF LibrarySearchGroups %] -- 2.39.5