From eb4ac2a32891a45ab89fc9ffe8fdb84c94ef5ad2 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 16 Sep 2015 09:01:26 +0100 Subject: [PATCH] [PASSED QA] Bug 14829: Fix shortcuts in the cataloging and patron modules In these 2 modules, the shortcuts alt+q, alt+r and alt+u don't work as in other modules. The tab are not "built" in the correct order and the id returned to select the correct tab is wrong. Test plan: Go on the circ home page (circ/circulation-home.pl), the patron home page (members/members-home.pl) and the cataloging home page (cataloguing/addbooks.pl). On these 3 pages, without this patch, the shortcuts select different tabs. With this patch, the issue is fixed for all of them. Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer --- .../prog/en/includes/cataloging-search.inc | 3 ++- .../intranet-tmpl/prog/en/includes/patron-search.inc | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc index 1fda946..4b6a9de 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc @@ -10,6 +10,8 @@ + [% INCLUDE 'patron-search-box.inc' %] + [% IF ( CAN_user_circulate ) %] - [% INCLUDE 'patron-search-box.inc' %]
  • Cataloging search
  • [% IF ( CAN_user_circulate ) %]
  • Check out
  • [% END %] 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 bb09574..e831487 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc @@ -114,14 +114,6 @@ [% INCLUDE 'patron-search-box.inc' %] - [% IF ( CAN_user_catalogue ) %] - [% END %] [% IF ( CAN_user_circulate ) %] [% END %] + + [% IF ( CAN_user_catalogue ) %] + [% END %] +