Bugzilla – Attachment 73183 Details for
Bug 20459
Correct message for cancelling an article request
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20459: Correct message for cancelling an article request
Bug-20459-Correct-message-for-cancelling-an-articl.patch (text/plain), 2.63 KB, created by
Nick Clemens (kidclamp)
on 2018-03-23 14:10:53 UTC
(
hide
)
Description:
Bug 20459: Correct message for cancelling an article request
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2018-03-23 14:10:53 UTC
Size:
2.63 KB
patch
obsolete
>From 3d8f6ab9ea4d667f169fd212ce03941fa5435470 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Thu, 22 Mar 2018 10:36:00 +0100 >Subject: [PATCH] Bug 20459: Correct message for cancelling an article request > >We should not ask for 'cancel this hold'. Remove corresponding TODO. > >Fix qa warning on old bootstrap style: > btn btn-mini => btn btn-default btn-xs >I removed above change, qa tool complaint is wrong (refers to staff, we > are on opac) > >Test plan: >Create an article request and cancel it on opac-user. > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> > >Signed-off-by: Nick Clemens <nick@bywatersolutions.com> >--- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >index 1a5203f..fed6f23 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >@@ -864,8 +864,7 @@ Using this account is not recommended because some parts of Koha will not functi > > <td class="article-request-cancel"> > <span class="tdlabel">Cancel:</span> >- <a class="btn btn-mini btn-danger" href="opac-article-request-cancel.pl?id=[% ar.id %]" onclick="return confirmDelete(MSG_CONFIRM_DELETE_HOLD);"><i class="icon-remove icon-white"></i> Cancel</a> >- <!-- TODO: replace MSG_CONFIRM_DELETE_HOLD with correct message --> >+ <a class="btn btn-mini btn-danger" href="opac-article-request-cancel.pl?id=[% ar.id %]" onclick="return confirmDelete(MSG_CONFIRM_DELETE_ARTREQ);"><i class="icon-remove icon-white"></i> Cancel</a> > </td> > </tr> > [% END %] >@@ -898,6 +897,7 @@ Using this account is not recommended because some parts of Koha will not functi > [% INCLUDE 'datatables.inc' %] > <script type="text/JavaScript"> > //<![CDATA[ >+ var MSG_CONFIRM_DELETE_ARTREQ = _("Are you sure you want to cancel this article request?"); > var MSG_CONFIRM_DELETE_HOLD = _("Are you sure you want to cancel this hold?"); > var MSG_CONFIRM_SUSPEND_HOLDS = _("Are you sure you want to suspend all holds?"); > var MSG_CONFIRM_RESUME_HOLDS = _("Are you sure you want to resume all suspended holds?"); >-- >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 20459
:
73151
| 73183