From d14716bfba50688e397b12a5ee17e18a7ce73d08 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 14 May 2021 15:04:38 +0000 Subject: [PATCH] Bug 28356: Consolidate catalogue search box code To test: 1 - Apply patch 2 - Confirm searchign the catalog works from: Administration->Budgets Cataloging Circulation->Check in Administration->Cities and towns Acquisitions->{Vendor}->Contracts Administration->Currencies Administration->Circulation desks (requires UseCirculationDesks preference) Home Tools->Notices and slips Patrons Adminstration Serials Acquisitions->Suggestions Administration->Z39.50/SRU servers --- .../prog/en/includes/budgets-admin-search.inc | 64 ++++++++++------------ .../intranet-tmpl/prog/en/includes/cat-search.inc | 15 +---- .../prog/en/includes/cataloging-search.inc | 14 +---- .../prog/en/includes/catalogue-search-box.inc | 13 +++++ .../prog/en/includes/checkin-search.inc | 15 +---- .../intranet-tmpl/prog/en/includes/circ-search.inc | 15 +---- .../prog/en/includes/cities-admin-search.inc | 14 +---- .../prog/en/includes/contracts-admin-search.inc | 15 +---- .../prog/en/includes/currencies-admin-search.inc | 14 +---- .../prog/en/includes/desks-admin-search.inc | 14 +---- .../intranet-tmpl/prog/en/includes/home-search.inc | 11 +--- .../prog/en/includes/letters-search.inc | 14 +---- .../prog/en/includes/patron-search.inc | 14 +---- .../prog/en/includes/prefs-admin-search.inc | 15 +---- .../prog/en/includes/serials-search.inc | 15 +---- .../prog/en/includes/suggestions-add-search.inc | 15 +---- .../prog/en/includes/z3950-admin-search.inc | 15 +---- 17 files changed, 58 insertions(+), 234 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc index 894f844a1b..fd188ddbe8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc @@ -3,43 +3,39 @@

[% LibraryName | html %]

- -[% INCLUDE 'patron-search-box.inc' %] + [% INCLUDE 'patron-search-box.inc' %] + [% INCLUDE 'catalogue-search-box.inc' %] - [% IF ( CAN_user_catalogue ) %] - [% END %] -
+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] +
  • Check out
  • + [% END %] + [% IF ( CAN_user_catalogue ) %] +
  • Search the catalog
  • + [% END %] + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc index cdafcfe01f..39409999f2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc @@ -23,20 +23,7 @@ [% END %] -[% IF ( CAN_user_catalogue ) %] - -[% END %] +[% INCLUDE 'catalogue-search-box.inc' %]