Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 38813: Make the 'curbside pickups' tab display selected if so

Browse source 
This patch fixes a wrong condition check in `usermenu.inc` for
determining if the tab should be active.

It currently checks for `ermview`, probably a copy and paste error.

This patch adds a new `curbside_pickups_view` parameter that is passed
instead.

Note: I tidied the code block I changed, inline to avoid extra commits.

To test:
1. Enable the `CurbsidePickup` system preference
2. Log into the OPAC
=> SUCCESS: There's a 'Curbside pickups' tab
3. Click on the tab
=> SUCCESS: The 'Curbside pickups' section gets displayed
=> FAIL: The tab remains inactive
4. Apply this patch
5. Restart plack:
   $ ktd --shell
  k$ koha-plack --restart kohadev
6. Repeat 3
=> SUCCESS: The 'Curbside pickups' section gets displayed
=> SUCCESS: The tab is rendered as active
7. Sign off :-D

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
Tomás Cohen Arazi 2025-01-02 14:46:13 -03:00 committed by Katrin Fischer
parent cdf12b9bda
commit 414f085781
Signed by: kfischer
GPG key ID: 0EF6E2C03357A834
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
View file

@ -150,7 +150,7 @@
[% END %]
[% IF Koha.Preference( 'CurbsidePickup' ) %]
[% IF ( ermview ) %]
[% IF ( curbside_pickups_view ) %]
<li class="active">
[% ELSE %]
<li>

11
opac/opac-curbside-pickups.pl
View file

@ -134,18 +134,15 @@ $template->param(
),
patron_curbside_pickups => Koha::CurbsidePickups->search(
{
borrowernumber => $logged_in_patron->borrowernumber,
borrowernumber => $logged_in_patron->borrowernumber,
},
{
order_by => { -asc => 'scheduled_pickup_datetime' }
}
{ order_by => { -asc => 'scheduled_pickup_datetime' } }
)->filter_by_scheduled_today,
curbside_pickups => Koha::CurbsidePickups->search(
{},
{
order_by => { -asc => 'scheduled_pickup_datetime' }
}
{ order_by => { -asc => 'scheduled_pickup_datetime' } }
)->filter_by_scheduled_today,
curbside_pickups_view => 1,
);
output_html_with_http_headers $input, $cookie, $template->output, undef,