Bugzilla – Attachment 12252 Details for
Bug 8559
conflicting item statuses
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 8559 - Conflicting item statuses - Make issuing a waiting item impossible.
Bug-8559---Conflicting-item-statuses---Make-issuin.patch (text/plain), 4.58 KB, created by
Kyle M Hall (khall)
on 2012-09-14 19:04:17 UTC
(
hide
)
Description:
Bug 8559 - Conflicting item statuses - Make issuing a waiting item impossible.
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2012-09-14 19:04:17 UTC
Size:
4.58 KB
patch
obsolete
>From 42162f285ac193d521d8b8be7b07383c3323754c Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Fri, 14 Sep 2012 15:03:49 -0400 >Subject: [PATCH] Bug 8559 - Conflicting item statuses - Make issuing a waiting item impossible. >Content-Type: text/plain; charset="utf-8" > >--- > C4/Circulation.pm | 17 ++++++++++------- > .../prog/en/modules/circ/circulation.tt | 16 +++++----------- > 2 files changed, 15 insertions(+), 18 deletions(-) > >diff --git a/C4/Circulation.pm b/C4/Circulation.pm >index e64f07d..58a5b48 100644 >--- a/C4/Circulation.pm >+++ b/C4/Circulation.pm >@@ -928,13 +928,16 @@ sub CanBookBeIssued { > { > # The item is on reserve and waiting, but has been > # reserved by some other patron. >- $needsconfirmation{RESERVE_WAITING} = 1; >- $needsconfirmation{'resfirstname'} = $resborrower->{'firstname'}; >- $needsconfirmation{'ressurname'} = $resborrower->{'surname'}; >- $needsconfirmation{'rescardnumber'} = $resborrower->{'cardnumber'}; >- $needsconfirmation{'resborrowernumber'} = $resborrower->{'borrowernumber'}; >- $needsconfirmation{'resbranchname'} = $branchname; >- $needsconfirmation{'reswaitingdate'} = format_date($res->{'waitingdate'}); >+ $issuingimpossible{RESERVE_WAITING} = 1; >+ $issuingimpossible{'resfirstname'} = $resborrower->{'firstname'}; >+ $issuingimpossible{'ressurname'} = $resborrower->{'surname'}; >+ $issuingimpossible{'rescardnumber'} = $resborrower->{'cardnumber'}; >+ $issuingimpossible{'resborrowernumber'} = $resborrower->{'borrowernumber'}; >+ $issuingimpossible{'resbranchname'} = $branchname; >+ $issuingimpossible{'reswaitingdate'} = format_date($res->{'waitingdate'}); >+ $issuingimpossible{'resbarcode'} = $item->{'barcode'}; >+ $issuingimpossible{'restitle'} = $biblioitem->{'title'}; >+ > } > elsif ( $restype eq "Reserved" ) { > # The item is on reserve for someone else. >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 c95002d..eff8ce5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -329,9 +329,6 @@ function validate1(date) { > <li>Item <i>[% getTitleMessageIteminfo %]</i> ([% getBarcodeMessageIteminfo %]) is currently checked out to this patron. Renew?</li> > [% END %] > >-[% IF ( RESERVE_WAITING ) %] >- <li>Item <i>[% getTitleMessageIteminfo %]</i> ([% getBarcodeMessageIteminfo %]) has been waiting for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber %]">[% resfirstname %] [% ressurname %]</a> ([% rescardnumber %]) at [% resbranchname %] since [% reswaitingdate %]</li> >-[% END %] > > [% IF ( RESERVED ) %] > <li>Item <i>[% getTitleMessageIteminfo %]</i> ([% getBarcodeMessageIteminfo %]) has been on hold for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber %]">[% resfirstname %] [% ressurname %]</a> ([% rescardnumber %]) at [% resbranchname %] since [% resreservedate %]</li> >@@ -375,13 +372,6 @@ function validate1(date) { > </p> > [% END %] > >-[% IF ( RESERVE_WAITING ) %] >- <p> >- <input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" /> >- <label for="cancelreserve">Cancel hold</label> >- </p> >-[% END %] >- > <input type="hidden" name="barcode" value="[% barcode %]" /> > <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> > <input type="hidden" name="issueconfirmed" value="1" /> >@@ -488,9 +478,13 @@ function validate1(date) { > <li>Patron has had overdue items and is blocked for [% USERBLOCKEDREMAINING %] day(s).</li> > [% END %] > >- [% IF ( USERBLOCKEDOVERDUE ) %] >+ [% IF ( USERBLOCKEDOVERDUE ) %] > <li>Checkouts are BLOCKED because patron has overdue items</li> > [% END %] >+ >+ [% IF ( RESERVE_WAITING ) %] >+ <li>Item <i>[% restitle %]</i> ( [% resbarcode %] ) has been waiting for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber %]">[% resfirstname %] [% ressurname %]</a> ([% rescardnumber %]) at [% resbranchname %] since [% reswaitingdate %]</li> >+ [% END %] > </ul> > > </div></div> >-- >1.7.2.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 8559
:
11293
|
12249
|
12250
|
12252
|
12275
|
12276
|
12279
|
12281
|
12679
|
13668
|
13669