From ef3a4434c044795ec823ed08bdd8aa7cde26304c Mon Sep 17 00:00:00 2001 From: Sukhmandeep Benipal Date: Thu, 12 Sep 2024 11:56:34 -0400 Subject: [PATCH] Bug 37761: Fix redirection on the tabs and buttons To test: - Apply the patch and enable the CurbsidePickup system preference if necessary. - Properly testing requires testing data. You can run this command to REPLACE your curbside pickup data with sample data: bash <(curl -s https://gitlab.com/-/snippets/2572579/raw/main/test_curbside_pickups.sh) - Go to Circulation -> Curbside pickups. - Confirm that the tabs look correct. The first tab should be active by default. - Confirm that the right content is displayed when you click each tab. - Under the "Schedule pickup" tab, search for a patron. - After you submit the search the page should reload and the "Schedule pickup" tab should be open. - Go on each tab and try each button to verify you're staying on the same tab. --- circ/curbside_pickups.pl | 2 +- .../prog/en/modules/circ/curbside_pickups.tt | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/circ/curbside_pickups.pl b/circ/curbside_pickups.pl index 9b4985cd3f..c8c3cf3ad6 100755 --- a/circ/curbside_pickups.pl +++ b/circ/curbside_pickups.pl @@ -59,7 +59,7 @@ if ( $op eq 'find-patron' ) { } )->filter_by_scheduled_today; - $tab = 'schedule-pickup'; + $tab = 'schedule-pickup_panel'; $template->param( patron => $patron, existing_curbside_pickups => $existing_curbside_pickups, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt index 9bcc40f5d6..319a5589d5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt @@ -216,7 +216,7 @@
[% INCLUDE 'csrf-token.inc' %] - +

@@ -226,7 +226,7 @@ [% INCLUDE 'csrf-token.inc' %] - +

@@ -272,7 +272,7 @@ [% INCLUDE 'csrf-token.inc' %] - +

@@ -282,7 +282,7 @@ [% INCLUDE 'csrf-token.inc' %] - +

@@ -292,7 +292,7 @@ [% INCLUDE 'csrf-token.inc' %] - +

@@ -338,7 +338,7 @@ [% INCLUDE 'csrf-token.inc' %] - +

@@ -348,7 +348,7 @@ [% INCLUDE 'csrf-token.inc' %] - +

@@ -358,7 +358,7 @@ [% INCLUDE 'csrf-token.inc' %] - +

@@ -431,7 +431,7 @@

- +
  1. -- 2.34.1