From a837560055a7831af31bb398f2a6347a234d9096 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 9 Jan 2026 12:13:30 +0100 Subject: [PATCH] Bug 41558: Fix and standardize links to tab on opac-user We have different implemented solution to select a tab on opac-user: * a "tab" variable (from bug 37972), it's never used * several variables passed from the controller to the template, depending on the tab to select (it works and is used) * use of anchors (it does not work and is used) We should fix and standardize it. I've linked to several reports that seem to conflict with each others. This patch suggests to have a "tab" variable Test plan: Confirm that the different links to tab to opac-user are not using a query parameter to pass the tab to select, e.g. from the opac-main page. Signed-off-by: Paul Derscheid Signed-off-by: David Nind --- .../en/includes/patron-restrictions.inc | 2 +- .../bootstrap/en/modules/opac-main.tt | 8 +++---- .../bootstrap/en/modules/opac-recall.tt | 2 +- .../bootstrap/en/modules/opac-user.tt | 24 ++++++++----------- opac/opac-article-request-cancel.pl | 2 +- opac/opac-modrequest-suspend.pl | 2 +- opac/opac-modrequest.pl | 2 +- opac/opac-request-article.pl | 2 +- opac/opac-reserve.pl | 2 +- opac/opac-user.pl | 23 ++++++++---------- 10 files changed, 31 insertions(+), 38 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-restrictions.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-restrictions.inc index 7b2453b7b3..5ca6ea5909 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-restrictions.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-restrictions.inc @@ -21,7 +21,7 @@ [% END %]
  • Usually the reason for freezing an account is old overdues or damage fees. If it appears that your account is clear, please contact the library. - Check your charges page. Check your overdues. + Check your charges page. Check your overdues.
  • diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt index c41dc43e9f..84859f99d1 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt @@ -234,7 +234,7 @@
      [% IF checkouts && checkouts > 0 %]
    • - + [% checkouts | html %] [% tn('checkout', 'checkouts', checkouts ) | html %] @@ -242,7 +242,7 @@ [% END %] [% IF overdues && overdues > 0 %]
    • - + [% overdues | html %] [% tn('overdue', 'overdues', overdues ) | html %] @@ -250,7 +250,7 @@ [% END %] [% IF holds_pending && holds_pending > 0 %]
    • - + [% holds_pending | html %] [% tn('hold pending', 'holds pending', holds_pending ) | html %] @@ -258,7 +258,7 @@ [% END %] [% IF holds_waiting && holds_waiting > 0 %]
    • - + [% holds_waiting | html %] [% tn('hold waiting', 'holds waiting', holds_waiting ) | html %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt index 9c58aa7343..07e9dba487 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt @@ -159,7 +159,7 @@ [% ELSIF ( hold.waitingdate ) %] Waiting for patron at [% Branches.GetName( hold.branchcode ) | html %] since [% hold.waitingdate | $KohaDates %]. [% ELSIF ( hold.borrowernumber == logged_in_user.borrowernumber ) %] - You have already placed a reserve on this item. + You have already placed a reserve on this item. [% END # / IF ( item.recall or hold ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt index 27d287c20b..6c4c48ae5b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -1050,6 +1050,9 @@ [% BLOCK jsinclude %] [% INCLUDE 'calendar.inc' %] [% INCLUDE 'datatables.inc' %] +