From c7dae1b51d92f7bf6b8563303b72d749d2414f19 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 31 Jul 2025 11:41:00 +0000 Subject: [PATCH] Bug 40568: Various corrections to recalls templates This patch makes various minor changes to recalls templates. - Correct markup in dropdown menu - Correct sorting of dates in tables - Wrap recalls table in "page-section" div. - Hide "Show old recalls" if there are no recalls. To test, apply the patch and enable Recalls if necessary. - If necessary, place some recalls. - Go to Circulation -> Recalls queue and check the "Actions" menu for one of the recalls. The "Mark as overdue" menu item should be formatted correctly. - Check the sorting of date columns on the "Recalls queue" page. It should be correct. - View a patron who has never placed a recall. Go to their recalls history and confirm that you see a "Patron has no recalls" message but no "Show old recalls" checkbox. Sponsored-by: Athens County Public Libraries --- .../prog/en/includes/recalls.inc | 38 +++++++++---------- .../prog/en/modules/members/recallshistory.tt | 8 ++-- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc index cdc0cffa11d..a4f8fece616 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc @@ -41,9 +41,9 @@ [% INCLUDE 'patron-title.inc' patron=recall.patron hide_patron_infos_if_needed=1 link_to="circulation_recalls" %] [% END %] - [% recall.created_date | $KohaDates %] + [% recall.created_date | $KohaDates %] - + [% IF ( recall.expiration_date ) %] [% recall.expiration_date | $KohaDates %] [% ELSIF ( !recall.completed ) %] @@ -74,7 +74,7 @@ [% UNLESS viewing_old %] - + [% IF recall.requested and recall.checkout %] Due to be returned by [% recall.checkout.date_due | $KohaDates %] [% ELSIF recall.waiting and RECALL.expiration_date %] @@ -94,27 +94,25 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt index aac63d06e51..f705ddda984 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt @@ -40,9 +40,11 @@ [% INCLUDE 'members-toolbar.inc' %]

Recalls history

[% IF Koha.Preference('UseRecalls') %] - - - [% INCLUDE 'recalls.inc' %] + [% IF recalls.count %] + + + [% END %] +
[% INCLUDE 'recalls.inc' %]
[% ELSE %]
Recalls have not been enabled. Enable the UseRecalls system preference to use recalls.
[% END %] -- 2.39.5