From 67398811d4ff8c09950ce458a815a201615fe68e Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 21 Oct 2021 12:16:07 +0000 Subject: [PATCH] Bug 29301: Display error with serials search flatpickr when searching Mana This patch changes the way certain serials search fields are hidden when a standalone search of Mana is being performed (from the "Search on Mana" link). Instead of targeting specific labels and inputs to hide we can hide list items by class. Unrelated: This patch updates the page heading so that it is different depending on whether you're searching Koha subscriptions or Mana subscriptions. To test, apply the patch and enable Mana. - Go to Serials -> Advanced search (in the search header). - The search form should include all fields, including call number, vendor, library, location, and "Expires before." - Click "Search on Mana" in the sidebar. - This page should have the heading "Mana subscriptions search," and there should only be three fields visible: ISSN, Title, and Publisher. - When you perform a Mana search which returns results the page should have the heading "Mana subscriptions (X found). Signed-off-by: David Nind Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart --- .../prog/en/modules/serials/serials-search.tt | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt index e33cf15fd1..83fd0ed3f1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt @@ -229,10 +229,18 @@ [% INCLUDE 'serials-toolbar.inc' %] - [% IF ( done_searched ) %] -

Serials subscriptions ([% total | html %] found)

+ [% IF ( mana ) %] + [% IF ( done_searched ) %] +

Mana subscriptions ([% total | html %] found)

+ [% ELSE %] +

Mana subscriptions search

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

Serials subscriptions search

+ [% IF ( done_searched ) %] +

Serials subscriptions ([% total | html %] found)

+ [% ELSE %] +

Serials subscriptions search

+ [% END %] [% END %] [% UNLESS ( done_searched ) %] @@ -255,7 +263,7 @@ [% END %] -
  • +
  • @@ -263,11 +271,11 @@ -
  • +
  • -
  • +
  • -
  • +
  • [% PROCESS 'av-build-dropbox.inc' name="location_filter", category="LOC", default=location_filter, all=1 %]
  • -
  • +
  • @@ -518,11 +526,7 @@ }); [% IF ( mana ) %] - $("label[for=callnumber], input#callnumber").hide(); - $("label[for=bookseller], input#bookseller").hide(); - $("label[for=branch], select#branch").hide(); - $("label[for=to], input#to").hide(); - $("label[for=location], select#location_filter").hide(); + $(".local").hide(); [% FOR field IN additional_fields_for_subscription %] $("label[for=additional_field_[% field.id | $raw %]], input#additional_field_[% field.id | $raw %]").hide(); [% END %] -- 2.39.5