From 74e00a7f23404f0c2b60e033887419401411376e Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Thu, 23 Feb 2023 16:42:36 +0000 Subject: [PATCH] Bug 33014: Improve serial searches This patch adds a new include for the serials 'advanced search' and uses that include on the serials home and serials search pages. It also adds some extra options ( Call number, publisher, vendor ) to the search included in the header. To test: 1. Apply patch 2. Go to the serials module and notice the main page now has an 'advanced search' form. Make sure it works. 3. After doing a search you'll be taken to serials-search.pl. Make sure the search forms in the side bar and in the header look good and work right. Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 9e61dc8009b899eb3e6b25c4e303f8bab9b068a3) Signed-off-by: Matt Blenkinsop --- .../prog/en/includes/serials-advsearch.inc | 64 ++++++++ .../prog/en/includes/serials-search.inc | 18 +++ .../prog/en/modules/serials/serials-home.tt | 4 +- .../prog/en/modules/serials/serials-search.tt | 137 +----------------- 4 files changed, 87 insertions(+), 136 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/serials-advsearch.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-advsearch.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-advsearch.inc new file mode 100644 index 0000000000..5f518e8827 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-advsearch.inc @@ -0,0 +1,64 @@ +[% PROCESS 'html_helpers.inc' %] +
+
+ [% IF brief %] +
+ [% ELSE %] +
+ [% END%] + Search subscriptions +
    +
  1. + + +
  2. +
  3. + + +
  4. + [% IF ( marcflavour == "UNIMARC" ) %] +
  5. + + +
  6. + [% END %] +
  7. + + +
  8. +
  9. + + +
  10. +
  11. + + +
  12. +
  13. + + +
  14. +
  15. + + [% PROCESS 'av-build-dropbox.inc' name="location_filter", category="LOC", default=location_filter, all=1 %] +
  16. +
  17. + + +
  18. + [% INCLUDE 'additional-fields-entry.inc' available=additional_fields_for_subscription values=additional_field_filters wrap_fieldset=0 %] +
+ + [% IF ( mana ) %] + + [% END %] +
+ +
+
+ +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc index 5e60974c15..6112eee5b7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc @@ -21,9 +21,27 @@ [% END %] + +
+
+ + +
+
+ + +
+
+ + +
+ +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt index be766d41dd..23cbc62e7c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt @@ -2,6 +2,7 @@ [% USE Asset %] [% USE KohaDates %] [% USE Koha %] +[% USE Branches %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Serials [% biblionumber | html %] › Koha @@ -35,7 +36,7 @@ [% INCLUDE 'serials-toolbar.inc' %]

Serials

- + [% INCLUDE 'serials-advsearch.inc' %] @@ -48,6 +49,7 @@ [% MACRO jsinclude BLOCK %] + [% INCLUDE 'calendar.inc' %] [% Asset.js("js/serials-toolbar.js") | $raw %]