From d395d07418e6ac448acefa20a1c6616f4564fdeb Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Tue, 5 May 2020 12:33:37 +0200
Subject: [PATCH] Bug 25033: Improve JS code a bit

---
 .../prog/en/modules/suggestion/suggestion.tt   | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
index 4a5cbb5661..15b5c5efd9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -430,11 +430,7 @@
         <li><label for="branchcode">Library:</label>
             <select name="branchcode" id="branchcode">
                 <option value="">Any</option>
-                [% IF branchfilter %]
-                    [% PROCESS options_for_libraries libraries => Branches.all( selected => branchfilter ) %]
-                [% ELSE %]
-                    [% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode ) %]
-                [% END %]
+                [% PROCESS options_for_libraries libraries => Branches.all( selected => branchfilter || branchcode ) %]
             </select>
         </li>
         <li><label for="budgetid">Fund:</label>
@@ -500,12 +496,8 @@
 
 <label for="branchcode">Viewing suggestions for library:</label>
 <select name="branchcode" id="branchcode">
-    <option value="">Any</option>
-    [% IF branchfilter %]
-        [% PROCESS options_for_libraries libraries => Branches.all( selected => branchfilter ) %]
-    [% ELSE %]
-        [% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode ) %]
-    [% END %]
+    <option value="__ANY__">Any</option>
+    [% PROCESS options_for_libraries libraries => Branches.all( selected => branchfilter || branchcode ) %]
 </select>
 
 
@@ -1015,11 +1007,13 @@
                 [% END %]
 
                 $("#branchcode").on('change',function(){
+                [%# Modify the hidden input in the filters block from the library %]
+                [%# dropdown list at the top of suggestion list %]
                     let branchcode = $(this).val();
-                    if( branchcode == '' ){ branchcode = "__ANY__" }
                     $('input[name="branchcode"]').val( branchcode );
                     $('form[name="suggestionfilter"]').submit();
                 });
+
                 $(".checkall").click(function(e){
                     e.preventDefault();
                     $(this).parents('form').checkCheckboxes();
-- 
2.20.1