From 45305fe2cb42ed83d2b292e13283a88e82ba5a47 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Fri, 15 Mar 2024 18:17:29 +0000
Subject: [PATCH] Bug 36334: (follow-up) Restore selection of previous values
 in sidebar

Before and after the first patch the values for category and library were not populated

To test:
1 - With nothing applied search in the top bar, clicking the 'settings' button
2 - Select a search field, search type, category, and library
3 - Perform search, note only search field and search type are populated
4 - Apply first path, repeat, same result
5 - Apply this patch, repeat
6 - Confirm all four fields now populate in sidebar

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 .../intranet-tmpl/prog/en/includes/patron-search.inc | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index 5f9016cf84..cd992e21c2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -52,7 +52,11 @@
                                         <option value="">Any</option>
                                     [% END %]
                                     [% FOREACH l IN libraries %]
-                                        <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option>
+                                        [% IF (l.branchcode == branchcode_filter) %]
+                                            <option value="[% l.branchcode | html %]" selected="selected">[% l.branchname | html %]</option>
+                                        [% ELSE %]
+                                            <option value="[% l.branchcode | html %]">[% l.branchname | html %]</option>
+                                        [% END %]
                                     [% END %]
                                 </select>
                             </label>
@@ -64,7 +68,11 @@
                                 <select class="categorycode_filter">
                                     <option value="">Any</option>
                                     [% FOREACH category IN Categories.limited.unblessed %]
-                                        <option value="[% category.categorycode | html %]">[% category.description | html %]</option>
+                                        [% IF ( category.categorycode == categorycode_filter ) %]
+                                            <option value="[% category.categorycode | html %]" selected="selected">[% category.description | html %]</option>
+                                        [% ELSE %]
+                                            <option value="[% category.categorycode | html %]">[% category.description | html %]</option>
+                                        [% END %]
                                     [% END %]
                                 </select>
                             </label>
-- 
2.39.5