Bugzilla – Attachment 159056 Details for
Bug 35216
Use return variable names from CanBookBeIssued in circulation.pl for consistency
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 35216: Rename question to needsconfirmation
Bug-35216-Rename-question-to-needsconfirmation.patch (text/plain), 3.45 KB, created by
Nick Clemens (kidclamp)
on 2023-11-16 15:55:02 UTC
(
hide
)
Description:
Bug 35216: Rename question to needsconfirmation
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2023-11-16 15:55:02 UTC
Size:
3.45 KB
patch
obsolete
>From 378a6f01d8b40a4119d0c86a60db0a7d869765ec Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Wed, 1 Nov 2023 15:37:54 +0000 >Subject: [PATCH] Bug 35216: Rename question to needsconfirmation > >--- > circ/circulation.pl | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) > >diff --git a/circ/circulation.pl b/circ/circulation.pl >index 63ad77fdffd..be02c85d826 100755 >--- a/circ/circulation.pl >+++ b/circ/circulation.pl >@@ -317,9 +317,9 @@ if (@$barcodes) { > }; > > # always check for blockers on issuing >- my ( $error, $question, $alerts, $messages ); >+ my ( $error, $needsconfirmation, $alerts, $messages ); > try { >- ( $error, $question, $alerts, $messages ) = CanBookBeIssued( >+ ( $error, $needsconfirmation, $alerts, $messages ) = CanBookBeIssued( > $patron, > $barcode, $datedue, > $inprocess, >@@ -403,7 +403,7 @@ if (@$barcodes) { > } > } > >- delete $question->{'DEBT'} if ($debt_confirmed); >+ delete $needsconfirmation->{'DEBT'} if ($debt_confirmed); > > if( $item and ( !$blocker or $force_allow_issue ) ){ > my $confirm_required = 0; >@@ -416,15 +416,15 @@ if (@$barcodes) { > $template_params->{itemhomebranch} = $item->homebranch; > > # pass needsconfirmation to template if issuing is possible and user hasn't yet confirmed. >- foreach my $needsconfirmation ( keys %$question ) { >- $template_params->{$needsconfirmation} = $$question{$needsconfirmation}; >+ foreach my $needsconfirmation ( keys %$needsconfirmation ) { >+ $template_params->{$needsconfirmation} = $$needsconfirmation{$needsconfirmation}; > $template_params->{getTitleMessageIteminfo} = $biblio->title; > $template_params->{getBarcodeMessageIteminfo} = $item->barcode; > $template_params->{NEEDSCONFIRMATION} = 1; > $confirm_required = 1; > if ( $needsconfirmation eq 'BOOKED_TO_ANOTHER' ) { > my $reduceddue = >- dt_from_string( $$question{$needsconfirmation}->start_date )->subtract( days => 1 ); >+ dt_from_string( $$needsconfirmation{$needsconfirmation}->start_date )->subtract( days => 1 ); > $template_params->{reduceddue} = $reduceddue; > } > } >@@ -445,7 +445,7 @@ if (@$barcodes) { > } > > # If booked (alerts or confirmation) update datedue to end of booking >- if ( my $booked = $question->{BOOKED_EARLY} // $alerts->{BOOKED} ) { >+ if ( my $booked = $needsconfirmation->{BOOKED_EARLY} // $alerts->{BOOKED} ) { > $datedue = $booked->end_date; > } > my $issue = AddIssue( >@@ -464,10 +464,10 @@ if (@$barcodes) { > } > } > >- if ($question->{RESERVE_WAITING} or $question->{RESERVED} or $question->{TRANSFERRED} or $question->{PROCESSING}){ >+ if ($needsconfirmation->{RESERVE_WAITING} or $needsconfirmation->{RESERVED} or $needsconfirmation->{TRANSFERRED} or $needsconfirmation->{PROCESSING}){ > $template->param( >- reserveborrowernumber => $question->{'resborrowernumber'}, >- reserve_id => $question->{reserve_id}, >+ reserveborrowernumber => $needsconfirmation->{'resborrowernumber'}, >+ reserve_id => $needsconfirmation->{reserve_id}, > ); > } > >-- >2.30.2
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 35216
:
158185
|
158186
|
158187
|
159039
|
159040
|
159056
|
159057
|
159072
|
159073
|
159085
|
159086
|
159180
|
159181