Bugzilla – Attachment 184937 Details for
Bug 40568
Various corrections to recalls templates
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 40568: Various corrections to recalls templates
Bug-40568-Various-corrections-to-recalls-templates.patch (text/plain), 7.71 KB, created by
Owen Leonard
on 2025-07-31 16:47:26 UTC
(
hide
)
Description:
Bug 40568: Various corrections to recalls templates
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2025-07-31 16:47:26 UTC
Size:
7.71 KB
patch
obsolete
>From c7dae1b51d92f7bf6b8563303b72d749d2414f19 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >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 @@ > <td class="recall-patron"> [% INCLUDE 'patron-title.inc' patron=recall.patron hide_patron_infos_if_needed=1 link_to="circulation_recalls" %] </td> > [% END %] > >- <td class="recall-date"> [% recall.created_date | $KohaDates %] </td> >+ <td class="recall-date" data-order="[% recall.created_date | html %]"> [% recall.created_date | $KohaDates %] </td> > >- <td class="recall-expiry"> >+ <td class="recall-expiry" data-order="[% recall.expiration_date | html %]"> > [% IF ( recall.expiration_date ) %] > [% recall.expiration_date | $KohaDates %] > [% ELSIF ( !recall.completed ) %] >@@ -74,7 +74,7 @@ > </td> > > [% UNLESS viewing_old %] >- <td class="recall-duedate"> >+ <td class="recall-duedate" data-order="[% recall.checkout.date_due | html %]"> > [% IF recall.requested and recall.checkout %] > <span>Due to be returned by [% recall.checkout.date_due | $KohaDates %]</span> > [% ELSIF recall.waiting and RECALL.expiration_date %] >@@ -94,27 +94,25 @@ > <button type="button" class="btn btn-sm btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> Actions </button> > <ul class="dropdown-menu dropdown-menu-end"> > [% IF ( recall.requested or recall.overdue ) %] >- <li >- ><a class="cancel_recall dropdown-item" data-id="[% recall.id | html %]"><i class="fa fa-times"></i> Cancel</a></li >- > >+ <li> >+ <a class="cancel_recall dropdown-item" data-id="[% recall.id | html %]"><i class="fa fa-times"></i> Cancel</a> >+ </li> > [% IF ( recall.should_be_overdue ) %] >- <li >- ><a class="overdue_recall" data-id="[% recall.id | html %]"><i class="fa fa-hourglass-end"></i> Mark as overdue</a></li >- > >+ <li> >+ <a class="overdue_recall dropdown-item" data-id="[% recall.id | html %]"><i class="fa fa-hourglass-end"></i> Mark as overdue</a> >+ </li> > [% END %] > [% ELSIF ( recall.waiting ) %] >- <li >- ><a class="revert_recall dropdown-item" data-id="[% recall.id | html %]"><i class="fa fa-undo"></i> Revert waiting</a></li >- > >- <li >- ><a class="expire_recall dropdown-item" data-id="[% recall.id | html %]"><i class="fa fa-times"></i> Expire</a></li >- > >+ <li> >+ <a class="revert_recall dropdown-item" data-id="[% recall.id | html %]"><i class="fa fa-undo"></i> Revert waiting</a> >+ </li> >+ <li> >+ <a class="expire_recall dropdown-item" data-id="[% recall.id | html %]"><i class="fa fa-times"></i> Expire</a> >+ </li> > [% ELSIF ( recall.in_transit ) %] >- <li >- ><a class="transit_recall dropdown-item" data-id="[% recall.id | html %]" >- ><i class="fa fa-times"></i> Cancel recall and return to: [% Branches.GetName(recall.item.homebranch) | html %]</a >- ></li >- > >+ <li> >+ <a class="transit_recall dropdown-item" data-id="[% recall.id | html %]"><i class="fa fa-times"></i> Cancel recall and return to: [% Branches.GetName(recall.item.homebranch) | html %]</a> >+ </li> > [% END %] > </ul> > </div> >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' %] > <h1>Recalls history</h1> > [% IF Koha.Preference('UseRecalls') %] >- <input type="checkbox" id="hide_old" name="hide_old" checked="checked" /> >- <label for="hide_old">Show old recalls</label> >- [% INCLUDE 'recalls.inc' %] >+ [% IF recalls.count %] >+ <input type="checkbox" id="hide_old" name="hide_old" checked="checked" /> >+ <label for="hide_old">Show old recalls</label> >+ [% END %] >+ <div class="page-section"> [% INCLUDE 'recalls.inc' %] </div> > [% ELSE %] > <div class="alert alert-info">Recalls have not been enabled. Enable the <a href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">UseRecalls</a> system preference to use recalls.</div> > [% END %] >-- >2.39.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 40568
: 184937