Bugzilla – Attachment 83456 Details for
Bug 15774
Additional fields for baskets
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15774: Fix and unify additional_fields in C4::Serials
Bug-15774-Fix-and-unify-additionalfields-in-C4Seri.patch (text/plain), 2.62 KB, created by
Nick Clemens (kidclamp)
on 2018-12-21 11:42:19 UTC
(
hide
)
Description:
Bug 15774: Fix and unify additional_fields in C4::Serials
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2018-12-21 11:42:19 UTC
Size:
2.62 KB
patch
obsolete
>From 362fdb75e173c544f0544789786b4bd714fd8826 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >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 <jonathan.druart@bugs.koha-community.org> >--- > C4/Serials.pm | 23 ++++++++++------------- > 1 file changed, 10 insertions(+), 13 deletions(-) > >diff --git a/C4/Serials.pm b/C4/Serials.pm >index d54151fffd..6c18df0719 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.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 15774
:
48224
|
53608
|
53609
|
72078
|
72079
|
72085
|
72086
|
75083
|
75084
|
75085
|
75086
|
75336
|
75354
|
75361
|
79976
|
79977
|
79978
|
79979
|
79980
|
79981
|
79982
|
80060
|
80061
|
80062
|
80063
|
80064
|
80065
|
80066
|
80680
|
81490
|
81491
|
81492
|
81493
|
81494
|
81495
|
81496
|
81497
|
81833
|
81837
|
81838
|
81839
|
81840
|
81841
|
81842
|
81843
|
81844
|
81845
|
81846
|
81847
|
81848
|
81849
|
81850
|
81851
|
81852
|
83349
|
83350
|
83351
|
83352
|
83353
|
83354
|
83355
|
83356
|
83357
|
83358
|
83359
|
83360
|
83361
|
83362
|
83363
|
83364
|
83444
|
83445
|
83446
|
83447
|
83448
|
83449
|
83450
|
83451
|
83452
|
83453
|
83454
|
83455
|
83456
|
83457
|
83458
|
83459
|
85333
|
85334
|
85335
|
85336
|
85337
|
85338
|
85339
|
85340
|
85341
|
85342
|
85343
|
85344
|
85345
|
85346
|
85347
|
85348
|
85792
|
85806
|
85807
|
85808
|
85809
|
85810
|
85811
|
85812
|
85813
|
85814
|
85815
|
85816
|
85817
|
85818
|
85819
|
85820
|
85821
|
85822
|
85823
|
85824
|
86411