gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 40866: Remove original Bug 9762 implementation remnants (Part 2 - Renewals) 

This patch removes the duplicate logging code from renewal scripts
(circ/renew.pl and svc/renew) that was part of the original Bug 9762
implementation.

The original implementation created separate logaction() calls with
custom JSON messages whenever renewal overrides occurred. This caused
double logging alongside the Alternative implementation which properly
logs overrides via the confirmations parameter in AddRenewal.

Changes:

circ/renew.pl:
- Removed unused variables: $user, $branchcode, @message
- Removed separate logaction() calls for override logging
- Changed to use confirmations array with proper codes:
  * 'RENEWAL_LIMIT' for override_limit
  * 'ON_RESERVE' for override_holds
- Removed C4::Log qw(logaction) import

svc/renew:
- Removed unused variables: $borrower, $user, $message, @message
- Removed separate logaction() calls for override logging
- Changed to use confirmations array with proper codes:
  * 'ON_RESERVE' for on_reserve override
  * 'RENEWAL_LIMIT' for too_many override
- Removed C4::Log qw(logaction) import

The Alternative implementation in AddRenewal will now handle all
override logging consistently through the confirmations parameter.

Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com>
Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit ca47310a3b)
Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de>
This commit is contained in:
Martin Renvoize 2025-10-09 07:29:17 +01:00 committed by Paul Derscheid
parent da4ef4bb7f
commit ad8c00c781
No known key found for this signature in database
GPG Key ID: C25F9FD44CED595B
2 changed files with 4 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
circ/renew.pl
View File

@ -24,7 +24,6 @@ use C4::Context;
use C4::Auth qw( get_template_and_user );
use C4::Output qw( output_html_with_http_headers );
use C4::Circulation qw( barcodedecode CanBookBeRenewed GetLatestAutoRenewDate AddRenewal );
use C4::Log qw( logaction );
use Koha::DateUtils qw( dt_from_string );
use Koha::Database;
use Koha::BiblioFrameworks;
@ -66,42 +65,19 @@ if ( $op eq 'cud-renew' && $barcode ) {
$patron = $checkout->patron;
my $borrowernumber = $patron->borrowernumber;
my $user = C4::Context->userenv->{number};
my $branchcode = C4::Context->userenv->{branch};
my @message;
if ( ( $patron->is_debarred || q{} ) lt dt_from_string()->ymd() ) {
my $confirmations;
my $can_renew;
my $info;
( $can_renew, $error, $info ) = CanBookBeRenewed( $patron, $checkout, $override_limit );
push @{$confirmations}, $override_limit if $override_limit;
push @{$confirmations}, 'RENEWAL_LIMIT' if $override_limit;
if ( $error && ( $error eq 'on_reserve' ) ) {
if ($override_holds) {
$can_renew = 1;
$error = undef;
@message = ("Override Renew hold for another");
my $infos = (
{
message => \@message,
borrowernumber => $borrowernumber,
barcode => $barcode,
manager_id => $user,
branchcode => $branchcode,
}
);
my $json_infos = JSON->new->utf8->pretty->encode($infos);
$json_infos =~ s/"/'/g;
logaction(
"CIRCULATION", "RENEWAL",
$patron->borrowernumber,
$json_infos,
) if C4::Context->preference("RenewalLog");
push @{$confirmations}, 'ON_RESERVE';
} else {
$can_renew = 0;
}
@ -133,27 +109,6 @@ if ( $op eq 'cud-renew' && $barcode ) {
}
);
$template->param( date_due => $date_due );
@message = ("Override limit Renew");
my $infos = (
{
message => \@message,
borrowernumber => $borrowernumber,
barcode => $barcode,
manager_id => $user,
branchcode => $branchcode,
}
);
my $json_infos = JSON->new->utf8->pretty->encode($infos);
$json_infos =~ s/"/'/g;
logaction(
"CIRCULATION", "RENEWAL",
$patron->borrowernumber,
$json_infos,
) if C4::Context->preference("RenewalLog");
}
} else {
$error = "patron_restricted";

52
svc/renew
View File

@ -26,7 +26,6 @@ use Try::Tiny;
use C4::Circulation qw( AddRenewal CanBookBeRenewed );
use C4::Context;
use C4::Auth qw(check_cookie_auth);
use C4::Log qw( logaction );
use Koha::DateUtils qw(output_pref dt_from_string);
@ -54,10 +53,6 @@ my $date_due;
if ( $input->param('date_due') ) {
$date_due = dt_from_string( scalar $input->param('date_due') );
}
my $borrower = Koha::Patrons->find($borrowernumber);
my $user = C4::Context->userenv->{'number'};
my $message;
my @message;
my $data;
$data->{itemnumber} = $itemnumber;
@ -75,56 +70,13 @@ my $confirmations;
if ( $data->{error} && $data->{error} eq 'on_reserve' && C4::Context->preference('AllowRenewalOnHoldOverride') ) {
$data->{renew_okay} = 1;
$data->{error} = undef;
push @{$confirmations}, 'ON_RESERVE' if $override_limit;
$message = "Override Renew hold for another";
@message = ("Override Renew hold for another");
my $infos = (
{
message => \@message,
borrowernumber => $borrowernumber,
barcode => $item->barcode,
manager_id => $user,
branchcode => $branchcode,
}
);
my $json_infos = JSON->new->utf8->pretty->encode($infos);
$json_infos =~ s/"/'/g;
logaction(
"CIRCULATION", "RENEWAL",
$borrower->{'borrowernumber'},
$json_infos,
) if C4::Context->preference("IssueLog");
push @{$confirmations}, 'ON_RESERVE';
}
if ( $data->{error} && $data->{error} eq 'too_many' && C4::Context->preference('AllowRenewalLimitOverride') ) {
$data->{renew_okay} = 1;
$data->{error} = undef;
$message = "Override limit Renew";
@message = ("Override limit Renew");
my $infos = (
{
message => \@message,
borrowernumber => $borrowernumber,
barcode => $item->barcode,
manager_id => $user,
branchcode => $branchcode,
}
);
my $json_infos = JSON->new->utf8->pretty->encode($infos);
$json_infos =~ s/"/'/g;
logaction(
"CIRCULATION", "RENEWAL",
$borrower->{'borrowernumber'},
$json_infos,
) if C4::Context->preference("IssueLog");
push @{$confirmations}, 'RENEWAL_LIMIT' if $override_limit;
}
if ( $data->{renew_okay} || ( $seen && $data->{error} eq 'too_unseen' ) ) {