Attachment 75867 Details for Bug 20875 – Bug 20875: (bug 16735 follow-up) Fix library list for OpacAddMastheadLibraryPulldown

[patch] Bug 20875: (bug 16735 follow-up) Fix library list for OpacAddMastheadLibraryPulldown

Bug-20875-bug-16735-follow-up-Fix-library-list-for.patch (text/plain), 2.57 KB, created by Martin Renvoize (ashimema) on 2018-06-07 08:06:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2018-06-07 08:06:17 UTC

Size: 2.57 KB

patch

obsolete

>From e2940bb7ddc3cd1c13812ea322c13ff9d1679d45 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>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 <katrin.fischer.83@web.de>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> 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 %]<optgroup label="Libraries">[% END %]
> 
>-                                            [% FOREACH BranchesLoo IN BranchesLoop %]
>-                                                [% IF ( BranchesLoo.selected ) %]<option selected="selected" value="branch:[% BranchesLoo.value %]">[% BranchesLoo.branchname %]</option>
>-                                                [% ELSE %]<option value="branch:[% BranchesLoo.value %]">[% BranchesLoo.branchname %]</option>[% END %]
>+                                            [% FOREACH library IN Branches.all( selected => opac_name ) %]
>+                                                [% IF library.selected %]
>+                                                    <option selected="selected" value="branch:[% library.branchcode %]">[% library.branchname %]</option>
>+                                                [% ELSE %]
>+                                                    <option value="branch:[% library.branchcode %]">[% library.branchname %]</option>
>+                                                [% END %]
>                                             [% END %]
> 
>                                             [% IF LibrarySearchGroups %]
>-- 
>2.14.2

Actions: View | Diff | Splinter Review

Attachments on bug 20875: 75773 | 75790 | 75867