From 6186c5477c5ad51e15465b8e7801ac7318a9c2df Mon Sep 17 00:00:00 2001 From: Lucas Gass <lucas@bywatersolutions.com> Date: Tue, 25 Apr 2023 21:34:28 +0000 Subject: [PATCH] Bug 33612: Fix cat-search.inc and remove home-search.inc To test: 1. Setup a staff member with staff access permission but no circulate permissions. 2. Log in as that and on the intranet-home page notice that 'Search patron' bar across the top is not visible by default. 3. Click the 'Search patrons' link at the top, now you see the search bar. 4. This is also true on the item search page. 5. Apply patch 6. Try looking at the intranet home and item search pages again, the search bar should be expanded by default. 7. git grep 'home-search.inc' , this include should be gone along with all references to it. 8. Log in as a superlibrarian and make sure the top search bars still seem correct and default to the correct ones. https://bugs.koha-community.org/show_bug.cgi?id=33584 --- .../prog/en/includes/cat-search.inc | 5 +++ .../prog/en/includes/home-search.inc | 40 ------------------- .../prog/en/modules/catalogue/itemsearch.tt | 2 +- .../prog/en/modules/intranet-main.tt | 2 +- 4 files changed, 7 insertions(+), 42 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc 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 513cf06b3e..89cc2841e6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc @@ -24,6 +24,11 @@ <a title="Renew" href="#renew_search" aria-controls="renew_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-retweet"></i> <span class="tab-title">Renew</span></a> </li> [% END %] + [% IF ( CAN_user_borrowers_edit_borrowers ) %] + <li role="presentation"> + <a title="Search patrons" href="#patron_search" aria-controls="patron_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-id-card-o"></i> <span class="tab-title">Search patrons</span></a> + </li> + [% END %] [% IF ( CAN_user_catalogue ) %] <li role="presentation" class="active"> <a title="Search catalog" href="#catalog_search" aria-controls="catalog_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-search"></i> <span class="tab-title">Search catalog</span></a> diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc deleted file mode 100644 index 2430d1da77..0000000000 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc +++ /dev/null @@ -1,40 +0,0 @@ -<!-- home-search.inc --> -<div id="header_search" role="tablist"> - <div class="tab-content"> - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] - [% INCLUDE 'patron-search-box.inc' bs_tab_active= 1 %] - [% INCLUDE 'checkin-search-box.inc' %] - [% INCLUDE 'renew-search-box.inc' %] - [% END %] - [% IF ( CAN_user_borrowers_edit_borrowers ) %] - [% INCLUDE 'member-search-box.inc' %] - [% END %] - [% IF ( CAN_user_catalogue ) %] - [% INCLUDE 'catalogue-search-box.inc' %] - [% END %] - </div><!-- /.tab-content --> - <ul class="nav nav-tabs" role="tablist"> - [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] - <li role="presentation" class="active"> - <a title="Check out" href="#circ_search" aria-controls="circ_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa fa-upload"></i> <span class="tab-title">Check out</span></a> - </li> - <li role="presentation"> - <a title="Check in" href="#checkin_search" aria-controls="checkin_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-download"></i> <span class="tab-title">Check in</span></a> - </li> - <li role="presentation"> - <a title="Renew" href="#renew_search" aria-controls="renew_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-retweet"></i> <span class="tab-title">Renew</span></a> - </li> - [% END %] - [% IF ( CAN_user_borrowers_edit_borrowers ) %] - <li role="presentation"> - <a title="Search patrons" href="#patron_search" aria-controls="patron_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-id-card-o"></i> <span class="tab-title">Search patrons</span></a> - </li> - [% END %] - [% IF ( CAN_user_catalogue ) %] - <li role="presentation"> - <a title="Search catalog" href="#catalog_search" aria-controls="catalog_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-search"></i> <span class="tab-title">Search catalog</span></a> - </li> - [% END %] - </ul> -</div><!-- /#header_search --> -<!-- /home-search.inc --> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt index c49f9227e7..ea4d1994cd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt @@ -149,7 +149,7 @@ <body id="catalog_itemsearch" class="catalog"> [% WRAPPER 'header.inc' %] - [% INCLUDE 'home-search.inc' %] + [% INCLUDE 'cat-search.inc' %] [% END %] [% WRAPPER 'sub-header.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt index 8f956fdc42..a9bdff7e3c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt @@ -12,7 +12,7 @@ <body id="main_intranet-main" class="intranet-main"> [% WRAPPER 'header.inc' %] - [% INCLUDE 'home-search.inc' %] + [% INCLUDE 'cat-search.inc' %] [% END %] [% WRAPPER 'sub-header.inc' %] -- 2.30.2