From 2f12c21a961f690b55c739f31b70f6ef366d2cb8 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 1 Nov 2018 17:57:24 -0300 Subject: [PATCH] Bug 15774: Fix and unify additional_fields in C4::Serials Signed-off-by: Jonathan Druart --- C4/Serials.pm | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/C4/Serials.pm b/C4/Serials.pm index d54151f..6c18df0 100644 --- a/C4/Serials.pm +++ b/C4/Serials.pm @@ -274,10 +274,9 @@ sub GetSubscription { $subscription->{cannotedit} = not can_edit_subscription( $subscription ); # Add additional fields to the subscription into a new key "additional_fields" - my %additional_field_values = map { - $_->field->name => $_->value - } Koha::Subscriptions->find($subscriptionid)->additional_field_values; - $subscription->{additional_fields} = \%additional_field_values; + my $subscription_object = Koha::Subscriptions->find($subscriptionid); + $subscription->{additional_fields} = { map { $_->field->name => $_->value } + $subscription_object->additional_field_values->as_list }; return $subscription; } @@ -624,10 +623,10 @@ sub SearchSubscriptions { $subscription->{cannotedit} = not can_edit_subscription( $subscription ); $subscription->{cannotdisplay} = not can_show_subscription( $subscription ); - my %additional_field_values = map { - $_->field->name => $_->value - } Koha::Subscriptions->find($subscription->{subscriptionid})->additional_field_values; - $subscription->{additional_fields} = \%additional_field_values; + my $subscription_object = Koha::Subscriptions->find($subscription->{subscriptionid}); + $subscription->{additional_fields} = { map { $_->field->name => $_->value } + $subscription_object->additional_field_values->as_list }; + } return @$results; @@ -1823,11 +1822,9 @@ sub GetLateOrMissingIssues { } $line->{"status".$line->{status}} = 1; - my $subscription = Koha::Subscriptions->find($line->{subscriptionid}); - my %additional_field_values = map { - $_->field->name => $_->value - } $subscription->additional_field_values; - %$line = ( %$line, additional_fields => \%additional_field_values ); + my $subscription_object = Koha::Subscriptions->find($line->{subscriptionid}); + $line->{additional_fields} = { map { $_->field->name => $_->value } + $subscription_object->additional_field_values->as_list }; push @issuelist, $line; } -- 2.1.4