Attachment 166845 Details for Bug 34838 – [23.11.x] Bug 34838: Use ->set to avoid method redefinition warnings

[patch] [23.11.x] Bug 34838: Use ->set to avoid method redefinition warnings

2311x-Bug-34838-Use--set-to-avoid-method-redefinit.patch (text/plain), 4.45 KB, created by Tomás Cohen Arazi (tcohen) on 2024-05-16 20:24:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomás Cohen Arazi (tcohen)

Created: 2024-05-16 20:24:53 UTC

Size: 4.45 KB

patch

obsolete

>From 24b016e10d918ffb11d1c78cfc794f053afdd52f Mon Sep 17 00:00:00 2001
>From: Tomas Cohen Arazi <tomascohen@theke.io>
>Date: Thu, 16 May 2024 17:13:05 -0300
>Subject: [PATCH] [23.11.x] 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 <tomascohen@theke.io>
>---
> Koha/Illrequest.pm                               | 16 ++++++++--------
> .../prog/en/modules/ill/ill-requests.tt          |  2 +-
> 2 files changed, 9 insertions(+), 9 deletions(-)
>
>diff --git a/Koha/Illrequest.pm b/Koha/Illrequest.pm
>index 15b4f6d5c7c..0f21c253106 100644
>--- a/Koha/Illrequest.pm
>+++ b/Koha/Illrequest.pm
>@@ -183,7 +183,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
>@@ -314,7 +314,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::Illrequest::Logger->new;
>@@ -368,7 +368,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
>@@ -1098,10 +1098,10 @@ Return a string representing the material type of this request or undef
> 
> sub get_type {
>     my ($self) = @_;
>-    my $attr = $self->illrequestattributes->find({ type => 'type'});
>+    my $attr = $self->extended_attributes->find( { type => 'type' } );
>     return if !$attr;
>     return $attr->value;
>-};
>+}
> 
> #### Illrequests Imports
> 
>@@ -1704,10 +1704,10 @@ and transport type
> sub get_notice {
>     my ( $self, $params ) = @_;
> 
>-    my $title = $self->illrequestattributes->find(
>+    my $title = $self->extended_attributes->find(
>         { type => 'title' }
>     );
>-    my $author = $self->illrequestattributes->find(
>+    my $author = $self->extended_attributes->find(
>         { type => 'author' }
>     );
>     my $metahash = $self->metadata;
>@@ -1719,7 +1719,7 @@ sub get_notice {
>     my $metastring = join("\n", @metaarray);
> 
>     my $illrequestattributes = {
>-        map { $_->type => $_->value } $self->illrequestattributes->as_list
>+        map { $_->type => $_->value } $self->extended_attributes->as_list
>     };
> 
>     my $letter = C4::Letters::GetPreparedLetter(
>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 aa4d6d97609..224cf822e7f 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
>@@ -729,7 +729,7 @@
>                                 </div>
>                                 <div class="modal-body">
>                                     <div id="requestattributes">
>-                                        [% FOREACH attr IN request.illrequestattributes %]
>+                                        [% FOREACH attr IN request.extended_attributes %]
>                                         <div class="requestattr-[% attr.type | html %]">
>                                             <span class="label">[% attr.type | html %]:</span>
>                                             [% attr.value | html %]
>-- 
>2.45.0

Actions: View | Diff | Splinter Review

Attachments on bug 34838: 156178 | 156200 | 156201 | 156202 | 156204 | 156217 | 156218 | 156219 | 156220 | 166841 | 166842 | 166843 | 166844 | 166845 | 166846 | 166847 | 166848 | 166849 | 166850 | 166851 | 166852 | 166853 | 166854 | 166855 | 167193 | 167194 | 167211 | 167212 | 167213 | 167214 | 167215 | 167216