Bugzilla – Attachment 116581 Details for
Bug 27645
Duplicate message in batch checkout
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 27645: Prevent "is on hold" warning to be displayed twice
Bug-27645-Prevent-is-on-hold-warning-to-be-display.patch (text/plain), 3.01 KB, created by
Jonathan Druart
on 2021-02-09 15:05:16 UTC
(
hide
)
Description:
Bug 27645: Prevent "is on hold" warning to be displayed twice
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2021-02-09 15:05:16 UTC
Size:
3.01 KB
patch
obsolete
>From 0e54b760e9e5b4b872fb2611e6c7cce35f38cbc2 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Tue, 9 Feb 2021 16:01:59 +0100 >Subject: [PATCH] Bug 27645: Prevent "is on hold" warning to be displayed twice > >During a batch checkout we display the "item is on hold" message >depending on different conditions. >However it can happen the message is displayed twice. > >If the checkout is not impossible then we see: >This item is on hold for another patron. >This item is on hold for another patron. The hold will be overridden, but not cancelled. > >We should only display the second one. > >Test plan: >With a default ktd setup you can simply place an item on hold and use the >batch checkout tool to check it out >--- > .../en/modules/circ/circulation_batch_checkouts.tt | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >index 59495fe2e7..6793b95c91 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >@@ -147,9 +147,6 @@ > [% IF checkout_info.RESERVE_WAITING %] > <li><i class="fa fa-li fa-warning"></i>This item is waiting for another patron.</li> > [% END %] >- [% IF checkout_info.RESERVED %] >- <li><i class="fa fa-li fa-warning"></i>This item is on hold for another patron.</li> >- [% END %] > [% IF checkout_info.ISSUED_TO_ANOTHER %] > <li><i class="fa fa-li fa-warning"></i>This item is checked out to another patron. > [% IF CAN_user_circulate_force_checkout %] >@@ -190,10 +187,10 @@ > </script> > [% END %] > >- [% IF NOT checkout_info.IMPOSSIBLE && ( CAN_user_circulate_force_checkout or checkout_info.HIGHHOLDS ) %] >- [% IF checkout_info.RESERVED || checkout_info.RESERVE_WAITING %] <!-- arbitrary choice, revert the reserve is not possible--> >- <li><i class="fa fa-li fa-warning"></i>This item is on hold for another patron. The hold will be overridden, but not cancelled.</li> >- [% END %] >+ [% IF NOT checkout_info.IMPOSSIBLE && ( CAN_user_circulate_force_checkout || checkout_info.HIGHHOLDS ) && ( checkout_info.RESERVED || checkout_info.RESERVE_WAITING ) %] <!-- arbitrary choice, revert the reserve is not possible--> >+ <li><i class="fa fa-li fa-warning"></i>This item is on hold for another patron. The hold will be overridden, but not cancelled.</li> >+ [% ELSIF checkout_info.RESERVED %] >+ <li><i class="fa fa-li fa-warning"></i>This item is on hold for another patron.</li> > [% END %] > > [% IF checkout_info.PREVISSUE %] >-- >2.20.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 27645
:
116431
|
116581
|
116586
|
116793