Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 20459: Correct message for cancelling an article request

Browse source 
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>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Marcel de Rooy 2018-03-22 10:36:00 +01:00 committed by Jonathan Druart
parent 9007c6e858
commit 4427f90de0
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
View file

@ -864,8 +864,7 @@ Using this account is not recommended because some parts of Koha will not functi
<td class="article-request-cancel"> <td class="article-request-cancel">
<span class="tdlabel">Cancel:</span> <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> <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>
<!-- TODO: replace MSG_CONFIRM_DELETE_HOLD with correct message -->
</td> </td>
</tr> </tr>
[% END %] [% END %]
@ -898,6 +897,7 @@ Using this account is not recommended because some parts of Koha will not functi
[% INCLUDE 'datatables.inc' %] [% INCLUDE 'datatables.inc' %]
<script type="text/JavaScript"> <script type="text/JavaScript">
//<![CDATA[ //<![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_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_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?"); var MSG_CONFIRM_RESUME_HOLDS = _("Are you sure you want to resume all suspended holds?");