From 8357d686ca80dcf98c4fb1e40290e53a2e6203dd Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 13 May 2013 14:26:17 -0400 Subject: [PATCH] Bug 10221 - hold expiration doesn't show on patron's list of holds When viewing the list of a patron's holds on the circulation page or the patron detail page the table of holds doesn't display the holds expiration date, if present. This patch adds display of the hold expiration date. To test, place a hold for a patron and set an expiration date for it. View the patron's existing holds on both circulation.pl and moremember.pl. The expiration date you chose should appear in the table of information about existing holds. Signed-off-by: Nicole C. Engard works great Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 225a7007052e9027f6fa1c141c6a3494224c1af8) Signed-off-by: Tomas Cohen Arazi Works as expected, I consider this an usability bugfix. --- circ/circulation.pl | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 ++ .../intranet-tmpl/prog/en/modules/members/moremember.tt | 6 ++++-- members/moremember.pl | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index ef0edf7cf8..52823f47df 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -406,6 +406,7 @@ if ($borrowernumber) { $getreserv{biblionumber} = $num_res->{'biblionumber'}; } $getreserv{waitingposition} = $num_res->{'priority'}; + $getreserv{expirationdate} = $num_res->{'expirationdate'}; push( @reservloop, \%getreserv ); # if we have a reserve waiting, initiate waitingreserveloop diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 42a9b27643..95252e70f7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -1103,6 +1103,7 @@ No patron matched [% message %] Title Call number Barcode + Expiration Priority Delete?   @@ -1121,6 +1122,7 @@ No patron matched [% message %] [% END %] [% IF ( reservloo.nottransfered ) %] hasn't been transferred yet from [% reservloo.nottransferedby %] [% END %] + [% reservloo.expirationdate | $KohaDates %] [% IF ( reservloo.waitingposition ) %] [% reservloo.waitingposition %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index 6ccdd3916a..1566a32992 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -51,7 +51,7 @@ $(document).ready(function() { { "aTargets": [ -1,-2 ], "bSortable": false, "bSearchable": false } ], "aoColumns": [ - { "sType": "title-string" },null,null,null,null,null,null + { "sType": "title-string" },null,null,null,null,null,null,null ], "bPaginate": false })); @@ -116,7 +116,7 @@ if (nodename =="barcodes[]"){ var Node=me.parentNode.previousSibling; while (Node.nodeName!="TD"){Node=Node.previousSibling} var Nodes=Node.childNodes; - for (var i=0;iTitle Call number Barcode + Expiration Priority Delete?   @@ -650,6 +651,7 @@ function validate1(date) { [% reservloo.barcodereserv %] [% END %] + [% reservloo.expirationdate | $KohaDates %] [% IF ( reservloo.waitingposition ) %][% reservloo.waitingposition %][% END %]