From 73df5c7b3f40cd6249322704514c095a5d4060fe Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Wed, 26 Feb 2020 17:38:53 +0100
Subject: [PATCH] Bug 24510: Code cleaning

Additional test plan:
Create 3 clubs: abc adf axy
place a hold for on of those club, search for a club 'a'
you will get the focus on the "Clubs" tab

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../prog/en/modules/reserve/request.tt        | 31 ++++++-------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
index 595f34f0b0..c8a56e8d8e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -974,27 +974,16 @@
         columns_settings_borrowers_table = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %]
 
         $(document).ready(function() {
-            [% UNLESS clubs %]
-                $('#circ_holds_select').tabs({
-                    active: 0,
-                    activate: function(){
-                        $(this).find("input.focus").focus();
-                    },
-                    create: function(){
-                        $(this).find("input.focus").focus();
-                    }
-                });
-            [% ELSE %]
-                $('#circ_holds_select').tabs({
-                    active: 1,
-                    activate: function(){
-                        $(this).find("input.focus").focus();
-                    },
-                    create: function(){
-                        $(this).find("input.focus").focus();
-                    }
-                });
-            [% END %]
+            [% SET active = clubs ? 1 : 0 %]
+            $('#circ_holds_select').tabs({
+                active: [% active %],
+                activate: function(){
+                    $(this).find("input.focus").focus();
+                },
+                create: function(){
+                    $(this).find("input.focus").focus();
+                }
+            });
             function ToggleHoldsToPlace() {
                 if ( $("#requestany").prop('checked') ) {
                     $("#holds_to_place_count").prop('disabled', false);
-- 
2.39.5