Bugzilla – Attachment 59276 Details for
Bug 11450
Hold Request Confirm Deletion
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11450: Hold Request Confirm Deletion
Bug-11450-Hold-Request-Confirm-Deletion.patch (text/plain), 5.08 KB, created by
Luke Honiss
on 2017-01-19 20:06:18 UTC
(
hide
)
Description:
Bug 11450: Hold Request Confirm Deletion
Filename:
MIME Type:
Creator:
Luke Honiss
Created:
2017-01-19 20:06:18 UTC
Size:
5.08 KB
patch
obsolete
>From a80c50be1452e4f988499ff758fb9bf588f211d6 Mon Sep 17 00:00:00 2001 >From: Luke Honiss <luke.honiss@gmail.com> >Date: Thu, 19 Jan 2017 02:55:31 +0000 >Subject: [PATCH] Bug 11450: Hold Request Confirm Deletion > >==TEST PLAN== >1) Go to an item with a hold and click on the holds tab on the >left >2) Click the red 'X' >3) The hold will be deleted immediately >4) Apply patch >5) Return to an item with a hold and click the 'X' >6) There will now be a confirmation dialog >7) Click cancel and the dialog will disappear and the hold will not be >deleted >8) Click OK and the hold will be deleted >--- > .../prog/en/modules/reserve/request.tt | 59 ++++++++++++---------- > 1 file changed, 32 insertions(+), 27 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 12b4e1b..cd7284c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -168,6 +168,11 @@ function checkMultiHold() { > $("#" + fieldID).val(""); > }); > >+ // Confirm cancelation of hold >+ $(".cancel-hold").on("click",function(e) { >+ return confirmDelete(MSG_CONFIRM_DELETE_HOLD); >+ }); >+ > > [% UNLESS ( borrowernumber || borrowers || noitems ) %] > [% IF ( CircAutocompl ) %] >@@ -855,38 +860,38 @@ 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 %]"> >- <img src="[% interface %]/[% theme %]/img/x.png" alt="Cancel" /> >- </a> >- </td> >- >- [% 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()" /> >- >- [% 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" value="[% reserveloo.suspend_until | $KohaDates %]" class="datepicker suspend_until_datepicker" /> >- <a href='#' onclick="document.getElementById('suspend_until_[% reserveloo.reserve_id %]').value='';">Clear date</a> >- [% ELSE %] >- <input type="hidden" name="suspend_until" id="suspend_until_[% reserveloo.reserve_id %]" value=""/> >- [% END %] >- [% ELSE %] >- <input type="hidden" name="suspend_until" value="" /> >- [% END %] >- </td> >- [% END # IF SuspendHoldsIntranet %] >+ <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> >+ >+ [% 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()" /> >+ >+ [% 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" value="[% reserveloo.suspend_until | $KohaDates %]" class="datepicker suspend_until_datepicker" /> >+ <a href='#' onclick="document.getElementById('suspend_until_[% reserveloo.reserve_id %]').value='';">Clear date</a> >+ [% ELSE %] >+ <input type="hidden" name="suspend_until" id="suspend_until_[% reserveloo.reserve_id %]" value=""/> >+ [% END %] >+[% ELSE %] >+ <input type="hidden" name="suspend_until" value="" /> >+[% END %] >+</td> >+ [% END # IF SuspendHoldsIntranet %] > >- </tr> >+ </tr> > >- [% END %] <!-- existing reserveloop --> >- </table> >- [% END %]<!-- /reserveloop --> >+[% END %] <!-- existing reserveloop --> >+ </table> >+[% END %]<!-- /reserveloop --> > [% END %]<!-- /biblioloop --> > > <fieldset class="action"> >- <input type="submit" name="submit" value="Update hold(s)" /> >+<input type="submit" name="submit" value="Update hold(s)" /> > </fieldset> > </fieldset> > </form> >-- >2.1.4
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 11450
:
59203
|
59276
|
59505
|
59563
|
59967
|
59968
|
60036
|
60068
|
60122
|
60220