Bugzilla – Attachment 76291 Details for
Bug 18521
Renew and search hotkeys are swapped on returns page.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18521: Fix key binding in the header
Bug-18521-Fix-key-binding-in-the-header.patch (text/plain), 3.16 KB, created by
Jonathan Druart
on 2018-06-22 14:42:27 UTC
(
hide
)
Description:
Bug 18521: Fix key binding in the header
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2018-06-22 14:42:27 UTC
Size:
3.16 KB
patch
obsolete
>From db90907b07a34bc9a1230d52363fd8641ca6f253 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> >--- > .../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.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 18521
:
75551
|
76108
| 76291