Bugzilla – Attachment 23935 Details for
Bug 9788
Improvements for calling GetReservesFromItemnumber
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 9788: QA followup
Bug-9788-QA-followup.patch (text/plain), 7.26 KB, created by
Marcel de Rooy
on 2014-01-06 12:44:43 UTC
(
hide
)
Description:
Bug 9788: QA followup
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2014-01-06 12:44:43 UTC
Size:
7.26 KB
patch
obsolete
>From dbf42ab9bcfd894fe53bfe4a78320482e2dd4a2e Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Mon, 4 Nov 2013 11:55:57 +0100 >Subject: [PATCH] Bug 9788: QA followup >Content-Type: text/plain; charset=utf-8 > >1/ CURRENT_DATE is a mysql and should be replaced with CAST(now() AS >date). >2/ The date formatting should be done in the template (using the TT >plugin). > >Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >--- > C4/Reserves.pm | 2 +- > catalogue/detail.pl | 2 +- > .../prog/en/modules/catalogue/detail.tt | 3 ++- > .../prog/en/modules/reserve/request.tt | 2 +- > .../opac-tmpl/prog/en/modules/opac-reserve.tt | 3 ++- > opac/opac-reserve.pl | 2 +- > reserve/request.pl | 2 +- > 7 files changed, 9 insertions(+), 7 deletions(-) > >diff --git a/C4/Reserves.pm b/C4/Reserves.pm >index 3e589b6..6c3739f 100644 >--- a/C4/Reserves.pm >+++ b/C4/Reserves.pm >@@ -372,7 +372,7 @@ sub GetReservesFromItemnumber { > my $query = " > SELECT reservedate,borrowernumber,branchcode,reserve_id,waitingdate > FROM reserves >- WHERE itemnumber=? AND ( reservedate <= CURRENT_DATE() OR >+ WHERE itemnumber=? AND ( reservedate <= CAST(now() AS date) OR > waitingdate IS NOT NULL ) > ORDER BY priority > "; >diff --git a/catalogue/detail.pl b/catalogue/detail.pl >index 25893be..a3df03b 100755 >--- a/catalogue/detail.pl >+++ b/catalogue/detail.pl >@@ -249,7 +249,7 @@ foreach my $item (@items) { > $item->{ExpectedAtLibrary} = $branches->{$expectedAt}{branchname}; > $item->{Reservedcardnumber} = $ItemBorrowerReserveInfo->{'cardnumber'}; > # Check waiting status >- $item->{waitingdate} = format_date($wait) if $wait; >+ $item->{waitingdate} = $wait; > } > > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >index 0a44dbf..1a81ef7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -1,5 +1,6 @@ > [% USE KohaDates %] > [% USE AuthorisedValues %] >+[% USE KohaDates %] > > [% ShowCourseReserves = 0 %] > [% IF UseCourseReserves %] >@@ -634,7 +635,7 @@ function verify_images() { > [% END %] > [% item.ExpectedAtLibrary %] > [% IF ( item.waitingdate ) %] >- since [% item.waitingdate %] >+ since [% item.waitingdate | $KohaDates %] > [% ELSE %] > [% IF ( item.reservedate ) %] > (placed [% item.reservedate %]) >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >index 9e46732..1eaf490 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -456,7 +456,7 @@ function checkMultiHold() { > [% IF ( itemloo.waitingdate ) %]Waiting[% ELSE %]On hold[% END %] > [% IF ( itemloo.canreservefromotherbranches ) %]for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.ReservedForBorrowernumber %]">[% itemloo.ReservedForFirstname %] [% itemloo.ReservedForSurname %]</a>[% END %] [% IF ( itemloo.waitingdate ) %]at[% ELSE %]expected at[% END %] [% itemloo.ExpectedAtLibrary %] > since >- [% IF ( itemloo.waitingdate ) %][% itemloo.waitingdate %][% ELSE %][% IF ( itemloo.reservedate ) %][% itemloo.reservedate %][% END %][% END %]. <a class="info" href="modrequest.pl?CancelBiblioNumber=[% itemloo.biblionumber %]&CancelBorrowerNumber=[% itemloo.ReservedForBorrowernumber %]&CancelItemnumber=[% itemloo.itemnumber %]" onclick="if (window.confirm('Are you sure you want to delete this hold?')) {return true;} else {return false;}">Cancel hold</a> >+ [% IF ( itemloo.waitingdate ) %][% itemloo.waitingdate | $KohaDates %][% ELSE %][% IF ( itemloo.reservedate ) %][% itemloo.reservedate %][% END %][% END %]. <a class="info" href="modrequest.pl?CancelBiblioNumber=[% itemloo.biblionumber %]&CancelBorrowerNumber=[% itemloo.ReservedForBorrowernumber %]&CancelItemnumber=[% itemloo.itemnumber %]" onclick="if (window.confirm('Are you sure you want to delete this hold?')) {return true;} else {return false;}">Cancel hold</a> > > [% END %] > [% ELSE %] >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt >index 671e1f9..b2e20c4 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt >@@ -1,4 +1,5 @@ > [% USE Koha %] >+[% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %][% LibraryNameTitle or "Koha online" %] catalog › Placing a hold > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] >@@ -529,7 +530,7 @@ > <span class="waiting">[% IF ( itemLoo.waitingdate ) %]Waiting[% ELSE %]On hold[% END %] for patron > [% IF ( itemLoo.waitingdate ) %]at[% ELSE %]expected at[% END %] [% itemLoo.ExpectedAtLibrary %] > since >- [% IF ( itemLoo.waitingdate ) %][% itemLoo.waitingdate %][% ELSE %][% IF ( itemLoo.reservedate ) %][% itemLoo.reservedate %][% END %][% END %]. >+ [% IF ( itemLoo.waitingdate ) %][% itemLoo.waitingdate | $KohaDates %][% ELSE %][% IF ( itemLoo.reservedate ) %][% itemLoo.reservedate %][% END %][% END %]. > </span> > [% ELSE %] > <span class="notonhold">Not on hold</span> >diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl >index 3b1ca2b..df55c19 100755 >--- a/opac/opac-reserve.pl >+++ b/opac/opac-reserve.pl >@@ -447,7 +447,7 @@ foreach my $biblioNum (@biblionumbers) { > $itemLoopIter->{ReservedForFirstname} = $ItemBorrowerReserveInfo->{'firstname'}; > $itemLoopIter->{ExpectedAtLibrary} = $expectedAt; > #waiting status >- $itemLoopIter->{waitingdate} = format_date($wait) if $wait; >+ $itemLoopIter->{waitingdate} = $wait; > } > > $itemLoopIter->{notforloan} = $itemInfo->{notforloan}; >diff --git a/reserve/request.pl b/reserve/request.pl >index 8701586..e915dbf 100755 >--- a/reserve/request.pl >+++ b/reserve/request.pl >@@ -338,7 +338,7 @@ foreach my $biblionumber (@biblionumbers) { > $item->{ReservedForSurname} = $ItemBorrowerReserveInfo->{'surname'}; > $item->{ReservedForFirstname} = $ItemBorrowerReserveInfo->{'firstname'}; > $item->{ExpectedAtLibrary} = $branches->{$expectedAt}{branchname}; >- $item->{waitingdate} = format_date($wait) if $wait; >+ $item->{waitingdate} = $wait; > } > > # Management of the notforloan document >-- >1.7.7.6
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 9788
:
16026
|
16092
|
19192
|
19193
|
19194
|
19940
|
19941
|
19943
|
19944
|
21479
|
21481
|
21750
|
22309
|
22610
|
22615
|
22640
|
22641
|
22642
|
22643
|
22644
|
22645
|
22646
|
22685
|
22686
|
22687
|
22688
|
22689
|
22693
|
23931
|
23932
|
23933
|
23934
| 23935 |
23936