From 3a6a8707c593d063d488e96470fad5492dfd4e84 Mon Sep 17 00:00:00 2001
From: Alex Buckley <alexbuckley@catalyst.net.nz>
Date: Thu, 24 May 2018 10:10:05 +0000
Subject: [PATCH] Bug 18521: Fix key binding in the header

Moving the conditional block [% IF (CAN_user_circulate_circulate_remaining_permissions ) %] block up the checkin-search.inc file above the CAN_user_catalogue IF conditional block fixes this bug.

Test plan:
1. Go to the circ home page and confirm the following
keyboard shortcuts work:

Alt+q = goes to search catalog
Alt+w = goes to renew

2. Go to returns.pl and confirm the following  keyboard shortcuts work:

Alt+q = goes to renew
Alt+w = goes to search catalog

3. Apply patch

4. Restart apache2, memchached and plack

5. Confirm on the returns.pl the following keyboard shortcuts work:
Alt+q = goes to search catalog
Alt+w = goes to renew

Sponsored-By: Catalyst IT

Signed-off-by: Maryse Simard <maryse.simard@inlibro.com>
Followed the test plan and it works.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 5c6c65476838d701b1f44199407efbade349967b)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 .../prog/en/includes/checkin-search.inc       | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
index edaaceedb6..0f4fc670f8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
@@ -3,16 +3,7 @@
 <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Checkin Resident Search Box -->
 <div id="header_search">
 [% INCLUDE 'patron-search-box.inc' %]
-[% IF ( CAN_user_catalogue ) %]
-<div id="catalog_search" class="residentsearch">
-    <p class="tip">Enter search keywords:</p>
-    <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-        [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
-        <input class="head-searchbox" type="text" name="q" id="search-form" size="40" />
-        <input type="submit" class="submit" value="Submit"/>
-    </form>
-</div>
-[% END %]
+
 [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
 <div id="renew_search" class="residentsearch">
     <p class="tip">Scan a barcode to renew:</p>
@@ -23,6 +14,16 @@
 </div>
 [% END %]
 
+[% IF ( CAN_user_catalogue ) %]
+<div id="catalog_search" class="residentsearch">
+    <p class="tip">Enter search keywords:</p>
+    <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
+        [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
+        <input class="head-searchbox" type="text" name="q" id="search-form" size="40" />
+        <input type="submit" class="submit" value="Submit"/>
+    </form>
+</div>
+[% END %]
 <ul>
     [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
     [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
-- 
2.39.5