Attachment 117512 Details for Bug 25690 – Bug 25690: (QA follow-up) PROCESSED -> PROCESSING for consistency

[patch] Bug 25690: (QA follow-up) PROCESSED -> PROCESSING for consistency

Bug-25690-QA-follow-up-PROCESSED---PROCESSING-for-.patch (text/plain), 7.61 KB, created by Joonas Kylmälä on 2021-03-02 13:00:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joonas Kylmälä

Created: 2021-03-02 13:00:39 UTC

Size: 7.61 KB

patch

obsolete

>From 5ea4b5306cba1a0927c826e97e18257e6e098360 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Fri, 19 Feb 2021 12:06:10 +0000
>Subject: [PATCH] Bug 25690: (QA follow-up) PROCESSED -> PROCESSING for
> consistency
>
>PROCESSED gave the apearance that the item processing had been completed
>whereas in reading the code it appears to actually signify that the item
>is awaiting/in proessing state.
>
>This patch updates the variable to be PROCESSING consistently throughout
>the codebase.
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> C4/Circulation.pm                                                     | 2 +-
> C4/SIP/ILS/Transaction/Checkout.pm                                    | 2 +-
> circ/branchtransfers.pl                                               | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt       | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt           | 4 ++--
> .../intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt | 4 ++--
> 6 files changed, 8 insertions(+), 8 deletions(-)
>
>diff --git a/C4/Circulation.pm b/C4/Circulation.pm
>index 9ed6ef3f88..52247bbfb4 100644
>--- a/C4/Circulation.pm
>+++ b/C4/Circulation.pm
>@@ -1149,7 +1149,7 @@ sub CanBookBeIssued {
>                 }
>                 elsif ( $restype eq "Processing" ) {
>                     # The item is determined hold being processed for someone else.
>-                    $needsconfirmation{PROCESSED} = 1;
>+                    $needsconfirmation{PROCESSING} = 1;
>                     $needsconfirmation{'resfirstname'} = $patron->firstname;
>                     $needsconfirmation{'ressurname'} = $patron->surname;
>                     $needsconfirmation{'rescardnumber'} = $patron->cardnumber;
>diff --git a/C4/SIP/ILS/Transaction/Checkout.pm b/C4/SIP/ILS/Transaction/Checkout.pm
>index fbd3816df8..2386d90fa1 100644
>--- a/C4/SIP/ILS/Transaction/Checkout.pm
>+++ b/C4/SIP/ILS/Transaction/Checkout.pm
>@@ -76,7 +76,7 @@ sub do_checkout {
>                 next;
>             } elsif ($confirmation eq 'RESERVE_WAITING'
>                       or $confirmation eq 'TRANSFERRED'
>-                      or $confirmation eq 'PROCESSED') {
>+                      or $confirmation eq 'PROCESSING') {
>                $debug and warn "Item is on hold for another patron.";
>                $self->screen_msg("Item is on hold for another patron.");
>                $noerror = 0;
>diff --git a/circ/branchtransfers.pl b/circ/branchtransfers.pl
>index c795236f69..95ec789926 100755
>--- a/circ/branchtransfers.pl
>+++ b/circ/branchtransfers.pl
>@@ -224,7 +224,7 @@ $template->param(
>     reserved                => $reserved,
>     waiting                 => $waiting,
>     transferred             => $hold_transferred,
>-    processed               => $hold_processed,
>+    processing              => $hold_processed,
>     borrowernumber          => $borrowernumber,
>     itemnumber              => $itemnumber,
>     barcode                 => $barcode,
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
>index 89a7f6d496..a1c0e5f496 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt
>@@ -50,7 +50,7 @@
>                     <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" />
>                     <input type="hidden" name="borrowernumber" value="[% borrowernumber | html %]" />
>                     <input type="hidden" name="tobranchcd" value="[% tobranchcd | html %]" />
>-                    [% IF ( waiting or transferred or processed ) %]
>+                    [% IF ( waiting or transferred or processing ) %]
>                         <input type="hidden" name="barcode" value="[% barcode | html %]" />
>                         <input type="hidden" name="request" value="KillWaiting" />
>                         <input type="submit" value="Cancel" />
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>index a71fb2873c..e0ea618df2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -126,7 +126,7 @@
>                                     <li>Item <em>[% getTitleMessageIteminfo | html %]</em> ([% getBarcodeMessageIteminfo | html %]) is on hold for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber | uri %]">[% resfirstname | html %] [% ressurname | html %]</a> ([% rescardnumber | html %]) and being transferred to [% Branches.GetName( resbranchcode ) | html %]</li>
>                                 [% END %]
> 
>-                                [% IF ( PROCESSED ) %]
>+                                [% IF ( PROCESSING ) %]
>                                     <li>Item <em>[% getTitleMessageIteminfo | html %]</em> ([% getBarcodeMessageIteminfo | html %]) is being processed for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber | uri %]">[% resfirstname | html %] [% ressurname | html %]</a> ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %]</li>
>                                 [% END %]
> 
>@@ -254,7 +254,7 @@
>                                         </p>
>                                     [% END %]
> 
>-                                    [% IF ( PROCESSED ) %]
>+                                    [% IF ( PROCESSING ) %]
>                                         <p>
>                                             <label for="cancelreserve">Cancel hold</label>
>                                             <input type="radio" value="cancel" name="cancelreserve" id="cancelreserve" /><br />
>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 6afb301479..4fe30d73ba 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
>@@ -150,7 +150,7 @@
>                   [% IF checkout_info.TRANSFERRED %]
>                       <li><i class="fa fa-li fa-warning"></i>This item is on hold and being transferred to another patron.</li>
>                   [% END %]
>-                  [% IF checkout_info.PROCESSED %]
>+                  [% IF checkout_info.PROCESSING %]
>                       <li><i class="fa fa-li fa-warning"></i>This item is on hold and being processed for another patron.</li>
>                   [% END %]
>                   [% IF checkout_info.ISSUED_TO_ANOTHER %]
>@@ -193,7 +193,7 @@
>                       </script>
>                   [% END %]
> 
>-                  [% IF NOT checkout_info.IMPOSSIBLE && ( CAN_user_circulate_force_checkout || checkout_info.HIGHHOLDS ) && ( checkout_info.RESERVED || checkout_info.RESERVE_WAITING || checkout_info.TRANSFERRED || checkout_info.PROCESSED ) %] 
>+                  [% IF NOT checkout_info.IMPOSSIBLE && ( CAN_user_circulate_force_checkout || checkout_info.HIGHHOLDS ) && ( checkout_info.RESERVED || checkout_info.RESERVE_WAITING || checkout_info.TRANSFERRED || checkout_info.PROCESSING ) %] 
>                       <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>
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 25690: 116948 | 116949 | 116950 | 116951 | 117000 | 117001 | 117002 | 117003 | 117004 | 117062 | 117063 | 117064 | 117065 | 117066 | 117067 | 117374 | 117507 | 117508 | 117509 | 117510 | 117511 | 117512 | 117513 | 117519 | 117520 | 117521 | 117522 | 117523 | 117524 | 117525 | 117674