From d6d92f9dc40a7c6933d7c80b745095943415ee6b Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 21 Nov 2018 16:42:03 +0000 Subject: [PATCH] Bug 21758: Navigation in Z39.50 result pages not working in Acquisitions This patch makes markup corrections to the acquisitions Z39.50 search results template so that the navigation form works correctly. Also changed: Removed invalid type attributes from style and script tags. To test, apply the patch and go to Acquisitions -> Vendor -> Basket. - Add to basket -> From an external source - Perform a Z39.50 search which will return multiple pages of results - On the search results page, use the form at the bottom of the page to navigate through results. Confirm that both the "Go" form and the next/previous buttons work. Signed-off-by: David Nind Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens --- .../prog/en/modules/acqui/z3950_search.tt | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt index 4e2959841b..e42087c054 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt @@ -5,12 +5,11 @@ Koha › Acquisitions › [% IF ( opsearch ) %]Order from external source[% ELSE %]Order from external source › Search results[% END %] [% Asset.css("css/datatables.css") | $raw %] [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'datatables.inc' %] [% USE Koha %] - @@ -23,9 +22,9 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
+ [% IF ( opsearch ) %]
- [% IF ( opsearch ) %]

Order from external source

@@ -55,7 +54,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : -
+

Search targets

@@ -71,19 +70,20 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :

[% END %] -
-
-
+ + +
Cancel
+
- [% ELSE %] +

Search results

@@ -204,7 +204,8 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : [% END %]
Nothing found. Try another search.
[% END %] -
+
+ [% END %] @@ -214,7 +215,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : [% Asset.js("js/acquisitions-menu.js") | $raw %] [% INCLUDE 'datatables.inc' %] [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %] -