From 6205b4910d48362dee4f0d3e99f802e07e9a82c5 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Thu, 16 May 2024 17:13:05 -0300 Subject: [PATCH] Bug 34838: Use ->set to avoid method redefinition warnings This patch silences more warnings. To test 1. Be on 23.11.x 2. Apply the patches before this one 3. Run: $ ktd --shell k$ prove t/db_dependent/Illrequests.t => FAIL: Lots of warnings like this: Subroutine Koha::Illrequest::SUPER::status redefined at /kohadevbox/koha/Koha/Object.pm line 955. Subroutine Koha::Illrequest::SUPER::status_alias redefined at /kohadevbox/koha/Koha/Object.pm line 955. illrequestattributes is DEPRECATED in favor of extended_attributes at t/db_dependent/Illrequests.t line 1071. 4. Apply this patch 5. Repeat 3 => SUCCESS: No more warnings! 6. Sign off :-D Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit ff42535f96f99d6fbcc27280401cd07bc65e54d2) Signed-off-by: Lucas Gass --- Koha/ILL/Request.pm | 8 ++++---- .../intranet-tmpl/prog/en/modules/ill/ill-requests.tt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Koha/ILL/Request.pm b/Koha/ILL/Request.pm index cc9f59bdff..beb185e078 100644 --- a/Koha/ILL/Request.pm +++ b/Koha/ILL/Request.pm @@ -184,7 +184,7 @@ sub statusalias { return Koha::AuthorisedValues->search( { category => 'ILL_STATUS_ALIAS', - authorised_value => $self->SUPER::status_alias + authorised_value => $self->get_column('status_alias'), }, {}, $self->branchcode @@ -315,7 +315,7 @@ sub status_alias { # We need a way of accepting implied undef, so we can nullify # the status_alias column, when called from $self->status my $val = $new_status_alias eq "-1" ? undef : $new_status_alias; - my $ret = $self->SUPER::status_alias($val); + my $ret = $self->set( { status_alias => $val } ); my $val_to_log = $val ? $new_status_alias : scalar $self->status; if ($ret) { my $logger = Koha::ILL::Request::Logger->new; @@ -369,7 +369,7 @@ sub status { $self->{previous_status} = $current_status_alias ? $current_status_alias : $current_status; - my $ret = $self->SUPER::status($new_status)->store; + my $ret = $self->set( { status => $new_status } )->store; if ($current_status_alias) { # This is hackery to enable us to undefine # status_alias, since we need to have an overloaded @@ -1174,7 +1174,7 @@ sub get_type { my $attr = $self->extended_attributes->find({ type => 'type'}); return if !$attr; return $attr->value; -}; +} =head3 get_type_disclaimer_value diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt index f97a00563d..a463e445cc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt @@ -764,7 +764,7 @@