Bugzilla – Attachment 32737 Details for
Bug 12692
Markup improvements to holds awaiting pickup report
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 12692 - Markup improvements to holds awaiting pickup report
PASSED-QA-Bug-12692---Markup-improvements-to-holds.patch (text/plain), 7.95 KB, created by
Katrin Fischer
on 2014-10-25 18:38:22 UTC
(
hide
)
Description:
[PASSED QA] Bug 12692 - Markup improvements to holds awaiting pickup report
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2014-10-25 18:38:22 UTC
Size:
7.95 KB
patch
obsolete
>From 211d2f6c75413cd43dad9b00b2be59a1c42a0c7f Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 1 Aug 2014 14:05:45 -0400 >Subject: [PATCH] [PASSED QA] Bug 12692 - Markup improvements to holds awaiting > pickup report > >This patch makes some minor updates to the output of the holds awaiting >pickup report. To test you should have several holds which are marked as >"waiting," including some which have been waiting longer than the number >of days specified in the ReservesMaxPickUpDelay system preference. > >- Go to Circulation -> Holds awaiting pickup >- In both the "waiting" and "over" tabs, confirm that titles display any > associated subtitle >- Confirm that library name is shown instead of library code >- Confirm that the patron name mailto: link works correctly > >Signed-off-by: Frederic Demians <f.demians@tamil.fr> > >Works as described: subtitle displayes (if mapping defined), library name >instead of code, and email as clickable mailto. > >Remark 1: As for bug 13083, subtitle display is not as good in UNIMARC than in >MARC21, since subtitle is not separated from title by ':'. > >Remark 2: 'subtitle' field is retrieved from a field mapping. Taking a look at >C4::Biblio::GetRecordValue, one see that the fieldmapping is directly queried. >There isn't any caching system, like for frameworks. > >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >Works as described and passes tests and QA script. >--- > circ/waitingreserves.pl | 1 + > .../prog/en/modules/circ/waitingreserves.tt | 28 ++++++++++++---------- > 2 files changed, 16 insertions(+), 13 deletions(-) > >diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl >index 07190a1..222939c 100755 >--- a/circ/waitingreserves.pl >+++ b/circ/waitingreserves.pl >@@ -114,6 +114,7 @@ foreach my $num (@getreserves) { > > $getreserv{'itemtype'} = $itemtypeinfo->{'description'}; > $getreserv{'title'} = $gettitle->{'title'}; >+ $getreserv{'subtitle'} = GetRecordValue('subtitle', GetMarcBiblio($gettitle->{'biblionumber'}), GetFrameworkCode($gettitle->{'biblionumber'})); > $getreserv{'biblionumber'} = $gettitle->{'biblionumber'}; > $getreserv{'barcode'} = $gettitle->{'barcode'}; > $getreserv{'branchname'} = GetBranchName($gettitle->{'homebranch'}); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >index 7ba913a..1d5faf4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >@@ -1,4 +1,5 @@ > [% USE KohaDates %] >+[% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Circulation › Holds awaiting pickup</title> > [% INCLUDE 'doc-head-close.inc' %] >@@ -89,16 +90,17 @@ > <tr> > <td><span title="[% reserveloo.waitingdate %]">[% reserveloo.waitingdate | $KohaDates %]</span></td> > <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %] >- [% reserveloo.title |html %] [% reserveloo.subtitle |html %] >+ [% reserveloo.title |html %] [% FOREACH subtitl IN reserveloo.subtitle %] [% subtitl.subfield %][% END %] > </a> >- (<b>[% reserveloo.itemtype %]</b>) >+ [% UNLESS ( item_level_itypes ) %][% IF ( reserveloo.itemtype ) %] (<b>[% reserveloo.itemtype %]</b>)[% END %][% END %] > <br />Barcode: [% reserveloo.barcode %] > </td> >- <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernum %]">[% reserveloo.borrowername %], [% reserveloo.borrowerfirstname %]</a><br />[% reserveloo.borrowerphone %]<br /> >- [% IF ( reserveloo.borrowermail ) %]<a href="mailto:[% reserveloo.email %]?subject=Reservation: [% reserveloo.title %]"> >+ <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernum %]">[% reserveloo.borrowername %], [% reserveloo.borrowerfirstname %]</a> >+ [% IF ( reserveloo.borrowerphone ) %]<br />[% reserveloo.borrowerphone %][% END %] >+ [% IF ( reserveloo.borrowermail ) %]<br /><a href="mailto:[% reserveloo.borrowermail %]?subject=Hold waiting: [% reserveloo.title %]"> > [% reserveloo.borrowermail %]</a>[% END %] > </td> >- <td>[% reserveloo.homebranch %]<br />[% reserveloo.itemcallnumber %]</td> >+ <td>[% Branches.GetName( reserveloo.homebranch ) %]<br />[% reserveloo.itemcallnumber %]</td> > <td>[% reserveloo.copynumber %]</td> > <td>[% reserveloo.enumchron %]</td> > <td> >@@ -122,19 +124,18 @@ > [% END %] > </div> > <div id="holdsover"> >- <p>Holds listed here have been awaiting pickup for more than [% ReservesMaxPickUpDelay %] days.</p> >+ [% IF ( ReservesMaxPickUpDelay ) %]<p>Holds listed here have been awaiting pickup for more than [% ReservesMaxPickUpDelay %] days.</p>[% END %] > [% IF ( overloop ) %] >- <p> >+ > <form name="cancelAllReserve" action="waitingreserves.pl" method="post"> > <input type="hidden" name="cancelall" value="1" /> > <input type="hidden" name="allbranches" value="[% allbranches %]" /> > <input type="submit" value="Cancel [% IF TransferWhenCancelAllWaitingHolds %]and Transfer [% END %]All" /> > </form> > [% UNLESS TransferWhenCancelAllWaitingHolds %] >- Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds sypref) >+ Only items that need not be transferred will be cancelled (TransferWhenCancelAllWaitingHolds sypref) > [% END %] >- </p> >- <br/> >+ > <table id="holdso"> > <thead><tr> > <th class="title-string">Available since</th> >@@ -148,16 +149,17 @@ > <tbody>[% FOREACH overloo IN overloop %] > <tr> > <td><p><span title="[% overloo.waitingdate %]">[% overloo.waitingdate | $KohaDates %]</span></p></td> >- <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = overloo.biblionumber %][% overloo.title |html %] [% overloo.subtitle |html %] >+ <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = overloo.biblionumber %][% overloo.title |html %] >+ [% FOREACH subtitl IN overloo.subtitle %] [% subtitl.subfield %][% END %] > </a> > [% UNLESS ( item_level_itypes ) %][% IF ( overloo.itemtype ) %] (<b>[% overloo.itemtype %]</b>)[% END %][% END %] > <br />Barcode: [% overloo.barcode %] > </td> > <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overloo.borrowernum %]">[% overloo.borrowername %], [% overloo.borrowerfirstname %]</a><br />[% overloo.borrowerphone %]<br /> >- [% IF ( overloo.borrowermail ) %]<a href="mailto:[% overloo.email %]?subject=Reservation: [% overloo.title |url %]"> >+ [% IF ( overloo.borrowermail ) %]<a href="mailto:[% overloo.borrowermail %]?subject=Reservation: [% overloo.title |url %]"> > [% overloo.borrowermail %]</a>[% END %] > </td> >- <td>[% overloo.homebranch %] [% overloo.itemcallnumber %]</td> >+ <td>[% Branches.GetName( overloo.homebranch ) %] [% overloo.itemcallnumber %]</td> > <td>[% overloo.copynumber %]</td> > <td>[% overloo.enumchron %]</td> > <td><form name="cancelReserve" action="waitingreserves.pl" method="post"> >-- >1.9.1
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 12692
:
30469
|
32734
| 32737