From 1cc936f5b47373005e27154c77341f3d40188e7b Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 21 Mar 2017 16:03:11 -0300 Subject: [PATCH] Bug 17708: Rename 'RENEW' with 'RENEWAL' Sounds more appropriate and consistent with existing action logs. Signed-off-by: Jonathan Druart --- C4/Circulation.pm | 2 +- t/db_dependent/Circulation.t | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 9304717..086ef2d 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -2922,7 +2922,7 @@ sub AddRenewal { ); #Log the renewal - logaction("CIRCULATION", "RENEW", $borrowernumber, $itemnumber) if C4::Context->preference("RenewalLog"); + logaction("CIRCULATION", "RENEWAL", $borrowernumber, $itemnumber) if C4::Context->preference("RenewalLog"); return $datedue; } diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t index 351ab77..63f4f5e 100755 --- a/t/db_dependent/Circulation.t +++ b/t/db_dependent/Circulation.t @@ -472,16 +472,16 @@ C4::Context->dbh->do("DELETE FROM accountlines"); ); t::lib::Mocks::mock_preference('RenewalLog', 0); my $date = output_pref( { dt => dt_from_string(), datenonly => 1, dateformat => 'iso' } ); - my $old_log_size = scalar(@{GetLogs( $date, $date, undef,["CIRCULATION"], ["RENEW"]) } ); + my $old_log_size = scalar(@{GetLogs( $date, $date, undef,["CIRCULATION"], ["RENEWAL"]) } ); AddRenewal( $renewing_borrower->{borrowernumber}, $itemnumber7, $branch ); - my $new_log_size = scalar(@{GetLogs( $date, $date, undef,["CIRCULATION"], ["RENEW"]) } ); + my $new_log_size = scalar(@{GetLogs( $date, $date, undef,["CIRCULATION"], ["RENEWAL"]) } ); is ($new_log_size, $old_log_size, 'renew log not added because of the syspref RenewalLog'); t::lib::Mocks::mock_preference('RenewalLog', 1); $date = output_pref( { dt => dt_from_string(), datenonly => 1, dateformat => 'iso' } ); - $old_log_size = scalar(@{GetLogs( $date, $date, undef,["CIRCULATION"], ["RENEW"]) } ); + $old_log_size = scalar(@{GetLogs( $date, $date, undef,["CIRCULATION"], ["RENEWAL"]) } ); AddRenewal( $renewing_borrower->{borrowernumber}, $itemnumber7, $branch ); - $new_log_size = scalar(@{GetLogs( $date, $date, undef,["CIRCULATION"], ["RENEW"]) } ); + $new_log_size = scalar(@{GetLogs( $date, $date, undef,["CIRCULATION"], ["RENEWAL"]) } ); is ($new_log_size, $old_log_size + 1, 'renew log successfully added'); -- 2.1.4