Bugzilla – Attachment 4926 Details for
Bug 6121
waitingreserves: branchname instead of branch code
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
proposed patch (passed QA)
0001-Bug-6121-Holds-awaiting-pickup.patch (text/plain), 3.89 KB, created by
Paul Poulain
on 2011-08-10 11:47:19 UTC
(
hide
)
Description:
proposed patch (passed QA)
Filename:
MIME Type:
Creator:
Paul Poulain
Created:
2011-08-10 11:47:19 UTC
Size:
3.89 KB
patch
obsolete
>From 4a03a84a504df796a2d5eb6fb240a593a39b8b7a Mon Sep 17 00:00:00 2001 >From: Christophe Croullebois <christophe.croullebois@biblibre.com> >Date: Tue, 8 Feb 2011 17:58:54 +0100 >Subject: [PATCH 1/2] Bug 6121: Holds awaiting pickup > >On holds over, when cancelling hold and returning to his branch a bug fill the branchtransfers.tobranch field with the branchname instead of the branch code. > >BibLibre MT5647 > >Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> >Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> >--- > circ/waitingreserves.pl | 3 ++- > .../prog/en/modules/circ/waitingreserves.tt | 6 +++--- > 2 files changed, 5 insertions(+), 4 deletions(-) > >diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl >index 9850114..352c9a6 100755 >--- a/circ/waitingreserves.pl >+++ b/circ/waitingreserves.pl >@@ -126,7 +126,8 @@ foreach my $num (@getreserves) { > $getreserv{'itemnumber'} = $gettitle->{'itemnumber'}; > $getreserv{'biblionumber'} = $gettitle->{'biblionumber'}; > $getreserv{'barcode'} = $gettitle->{'barcode'}; >- $getreserv{'homebranch'} = GetBranchName($gettitle->{'homebranch'}); >+ $getreserv{'branchname'} = GetBranchName($gettitle->{'homebranch'}); >+ $getreserv{'homebranch'} = $gettitle->{'homebranch'}; > $getreserv{'holdingbranch'} = $gettitle->{'holdingbranch'}; > $getreserv{'itemcallnumber'} = $gettitle->{'itemcallnumber'}; > if ( $gettitle->{'homebranch'} ne $gettitle->{'holdingbranch'} ) { >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 39400bf..6bfe480 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >@@ -102,7 +102,7 @@ $.tablesorter.addParser({ > <input type="hidden" name="fbr" value="[% reserveloo.holdingbranch %]" /> > <input type="hidden" name="tbr" value="[% reserveloo.homebranch %]" /> > [% IF ( reserveloo.dotransfer ) %] >- <input type="submit" value="Cancel hold and return to : [% reserveloo.homebranch %]" /> >+ <input type="submit" value="Cancel hold and return to : [% reserveloo.branchname %]" /> > [% ELSE %] > <input type="submit" value="Cancel hold" /> > [% END %] >@@ -129,7 +129,7 @@ $.tablesorter.addParser({ > <tbody>[% FOREACH overloo IN overloop %] > <tr> > <td><p>[% overloo.waitingdate %]</p></td> >- <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = overloo.biblionumber %][% overloo.title |html %] [% overloo.subtitle |html %] >+ <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %][% overloo.title |html %] [% overloo.subtitle |html %] > </a> > [% UNLESS ( item_level_itypes ) %][% IF ( overloo.itemtype ) %] (<b>[% overloo.itemtype %]</b>)[% END %][% END %] > <br />Barcode: [% overloo.barcode %] >@@ -145,7 +145,7 @@ $.tablesorter.addParser({ > <input type="hidden" name="fbr" value="[% overloo.holdingbranch %]" /> > <input type="hidden" name="tbr" value="[% overloo.homebranch %]" /> > [% IF ( overloo.dotransfer ) %] >- <input type="submit" value="Cancel hold and return to : [% overloo.homebranch %]" /> >+ <input type="submit" value="Cancel hold and return to : [% overloo.branchname %]" /> > [% ELSE %] > <input type="submit" value="Cancel hold" /> > [% END %] >-- >1.7.4.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 6121
:
3804
|
4133
| 4926 |
4927