Bugzilla – Attachment 54109 Details for
Bug 17057
Remove event attributes from holds template
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 17057 - Remove event attributes from holds template
PASSED-QA-Bug-17057---Remove-event-attributes-from.patch (text/plain), 9.92 KB, created by
Katrin Fischer
on 2016-08-07 09:48:48 UTC
(
hide
)
Description:
[PASSED QA] Bug 17057 - Remove event attributes from holds template
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2016-08-07 09:48:48 UTC
Size:
9.92 KB
patch
obsolete
>From 1d83392376149f46f8ebd01e084d6c9e94ae1db4 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Thu, 4 Aug 2016 14:37:11 -0400 >Subject: [PATCH] [PASSED QA] Bug 17057 - Remove event attributes from holds > template > >This patch removes event attributes from the holds template. Events >are defined instead in the JavaScript. > >Also changed: Move formatting of hold date to the template; Corrected a >non-functional 'cancel hold' link. > >To test apply the patch and: > >- Start the process of placing a hold on a single title for a > patron. > - Uncheck 'Place a hold on the next available item' and try to > submit the form without selecting an item. You should be prompted > to select an item. >- Place a hold on multiple titles at the same time. Confirm that your > hold is saved correctly. >- View the holds for a title which has multiple holds. > - Confirm that clicking the "X" image triggers a confirmation. Test > canceling and confirming. > - With SuspendHoldsIntranet enabled, select a 'Suspend until' date for > any hold and confirm that the corresponding 'Clear date' link works > correctly. > - Confirm that suspending a hold with and without an expiration date > works correctly. >- Place an item-level hold. > - View the holds for that same title. > - Submit another patron to place a new hold. > - In the list of items which can be placed on hold, look for the item > you place on hold previously. There should be a "Cancel hold" link > in the information column. Confirm that this link correctly triggers > a confirmation dialog and deletes the hold. > >Signed-off-by: Claire Gravely <c.gravely@arts.ac.uk> > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > .../prog/en/modules/reserve/request.tt | 55 ++++++++++++++++++---- > reserve/request.pl | 3 +- > 2 files changed, 47 insertions(+), 11 deletions(-) > >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 ba53b3a..bf0b024 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -15,7 +15,6 @@ > [% INCLUDE 'calendar.inc' %] > <script type="text/javascript"> > // <![CDATA[ >-var MSG_CONFIRM_DELETE_HOLD = _("Are you sure you want to cancel this hold?"); > var patron_homebranch = "[% borrower_branchname |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; > var override_items = {[% FOREACH bibitemloo IN bibitemloop %][% FOREACH itemloo IN bibitemloo.itemloop %][% IF ( itemloo.override ) %] > [% itemloo.itemnumber %]: { >@@ -87,8 +86,10 @@ function check() { > msg += (_("- This patron had already placed a hold on this item") + "\n" + _("Please cancel the previous hold first") + "\n"); > } > >- if (msg == "") return(true); >- else { >+ if (msg == ""){ >+ $(this).preventDoubleFormSubmit(); >+ return(true); >+ } else { > alert(msg); > return(false); > } >@@ -164,7 +165,34 @@ function checkMultiHold() { > $("#" + fieldID).val(""); > }); > >- $('#hold-request-form').preventDoubleFormSubmit(); >+ $('#hold-request-form').on("submit",function(){ >+ return check(); >+ }); >+ >+ $("#multihold_request_form") >+ .on("submit",function(){ >+ return checkMultiHold(); >+ }) >+ .preventDoubleFormSubmit(); >+ >+ $(".cancel_hold").on("click",function(){ >+ return confirmDelete( _("Are you sure you want to cancel this hold?") ); >+ }); >+ >+ $(".suspend_hold").on("click",function(e){ >+ e.preventDefault(); >+ var reserve_id = $(this).data("reserve_id"); >+ var biblionumber = $(this).data("biblionumber"); >+ var borrowernumber = $(this).data("borrowernumber"); >+ var reservedate = $(this).data("reservedate") >+ window.location.href = "request.pl?action=toggleSuspend&reserve_id=" + reserve_id + "&borrowernumber=" + borrowernumber + "&biblionumber=" + biblionumber + "&date=" + reservedate + "&suspend_until=" + $("#suspend_until_" + reserve_id).val(); >+ }); >+ >+ $(".clear_date").on("click",function(e){ >+ e.preventDefault(); >+ var reserve_id = $(this).data("reserve_id"); >+ $("#suspend_until_" + reserve_id).val(''); >+ }); > > [% UNLESS ( borrowernumber || borrowers || noitems ) %] > [% IF ( CircAutocompl ) %] >@@ -320,9 +348,9 @@ function checkMultiHold() { > <fieldset class="rows left"> > <legend>Hold details</legend> > [% UNLESS ( multi_hold ) %] >- <form action="placerequest.pl" method="post" onsubmit="return check();" name="form" id="hold-request-form"> >+ <form action="placerequest.pl" method="post" name="form" id="hold-request-form"> > [% ELSE %] >- <form action="placerequest.pl" method="post" onsubmit="return checkMultiHold();" name="form"> >+ <form action="placerequest.pl" method="post" name="form" id="multihold_request_form"> > [% END %] > > <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> >@@ -521,7 +549,14 @@ 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 | $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="return confirmDelete(MSG_CONFIRM_DELETE_HOLD);">Cancel hold</a> >+ [% IF ( itemloo.waitingdate ) %] >+ [% itemloo.waitingdate | $KohaDates %] >+ [% ELSE %] >+ [% IF ( itemloo.reservedate ) %] >+ [% itemloo.reservedate | $KohaDates %] >+ [% END %] >+ [% END %]. >+ <a class="info cancel_hold" href="request.pl?action=cancel&borrowernumber=[% itemloo.ReservedForBorrowernumber %]&biblionumber=[% itemloo.biblionumber %]&reserve_id=[% itemloo.reserve_id %]&date=[% itemloo.reservedate %]">Cancel hold</a> > > [% END %] > [% ELSE %] >@@ -798,7 +833,7 @@ function checkMultiHold() { > [% END %] > > <td> >- <a title="Cancel hold" href="request.pl?action=cancel&borrowernumber=[% reserveloo.borrowernumber %]&biblionumber=[% reserveloo.biblionumber %]&reserve_id=[% reserveloo.reserve_id %]&date=[% reserveloo.date %]"> >+ <a class="cancel_hold" title="Cancel hold" href="request.pl?action=cancel&borrowernumber=[% reserveloo.borrowernumber %]&biblionumber=[% reserveloo.biblionumber %]&reserve_id=[% reserveloo.reserve_id %]&date=[% reserveloo.date %]"> > <img src="[% interface %]/[% theme %]/img/x.png" alt="Cancel" /> > </a> > </td> >@@ -806,12 +841,12 @@ function checkMultiHold() { > [% IF SuspendHoldsIntranet %] > <td> > [% UNLESS ( reserveloo.found ) %] >- <input type="button" value="[% IF ( reserveloo.suspend ) %]Unsuspend[% ELSE %]Suspend[% END %]" onclick="window.location.href='request.pl?action=toggleSuspend&reserve_id=[% reserveloo.reserve_id %]&borrowernumber=[% reserveloo.borrowernumber %]&biblionumber=[% reserveloo.biblionumber %]&date=[% reserveloo.date %]&suspend_until=' + $('#suspend_until_[% reserveloo.reserve_id %]').val()" /> >+ <input type="button" class="suspend_hold" data-reserve_id="[% reserveloo.reserve_id %]" data-biblionumber="[% reserveloo.biblionumber %]" data-reservedate="[% reserveloo.date %]" data-borrowernumber="[% reserveloo.borrowernumber %]" value="[% IF ( reserveloo.suspend ) %]Unsuspend[% ELSE %]Suspend[% END %]" /> > > [% IF AutoResumeSuspendedHolds %] > <label for="suspend_until_[% reserveloo.reserve_id %]">[% IF ( reserveloo.suspend ) %] on [% ELSE %] until [% END %]</label> > <input name="suspend_until" id="suspend_until_[% reserveloo.reserve_id %]" size="10" readonly="readonly" value="[% reserveloo.suspend_until | $KohaDates %]" class="datepicker suspend_until_datepicker" /> >- <a href='#' onclick="document.getElementById('suspend_until_[% reserveloo.reserve_id %]').value='';">Clear date</a> >+ <a href="#" class="clear_date" data-reserve_id="[% reserveloo.reserve_id %]">Clear date</a> > [% ELSE %] > <input type="hidden" name="suspend_until" id="suspend_until_[% reserveloo.reserve_id %]" value=""/> > [% END %] >diff --git a/reserve/request.pl b/reserve/request.pl >index 1980abb..e62da6c 100755 >--- a/reserve/request.pl >+++ b/reserve/request.pl >@@ -382,10 +382,11 @@ foreach my $biblionumber (@biblionumbers) { > my $ItemBorrowerReserveInfo = GetMember( borrowernumber => $reservedfor ); > > $item->{backgroundcolor} = 'reserved'; >- $item->{reservedate} = output_pref({ dt => dt_from_string( $reservedate ), dateonly => 1 }); >+ $item->{reservedate} = $reservedate; > $item->{ReservedForBorrowernumber} = $reservedfor; > $item->{ReservedForSurname} = $ItemBorrowerReserveInfo->{'surname'}; > $item->{ReservedForFirstname} = $ItemBorrowerReserveInfo->{'firstname'}; >+ $item->{reserve_id} = $reserve_id; > $item->{ExpectedAtLibrary} = $branches->{$expectedAt}{branchname}; > $item->{waitingdate} = $wait; > } >-- >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 17057
:
54055
|
54072
|
54109
|
92178
|
92179
|
92293
|
92294
|
92329
|
92330