RFID: correctly handle keyboard shortcuts

[koha_ffzg] / serials / subscription-add.pl

diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl
index 31198c6..9e503e5 100755 (executable)
--- a/serials/subscription-add.pl
+++ b/serials/subscription-add.pl
@@ -29,7 +29,7 @@ use C4::Serials;
 use C4::Serials::Frequency;
 use C4::Serials::Numberpattern;
 use C4::Letters;
-use Koha::AdditionalField;
+use Koha::AdditionalFields;
 use Koha::Biblios;
 use Koha::DateUtils;
 use Koha::ItemTypes;
@@ -70,10 +70,10 @@ our $firstissuedate;
 
 my $mana_url = C4::Context->config('mana_config');
 $template->param( 'mana_url' => $mana_url );
+my $subscriptionid = $query->param('subscriptionid');
 
 if ($op eq 'modify' || $op eq 'dup' || $op eq 'modsubscription') {
 
-    my $subscriptionid = $query->param('subscriptionid');
     $subs = GetSubscription($subscriptionid);
 
     output_and_exit( $query, $cookie, $template, 'unknown_subscription')
@@ -144,14 +144,19 @@ $template->param(
     locations_loop=>$locations_loop,
 );
 
-
-my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription' } );
-for my $field ( @$additional_fields ) {
-    if ( $field->{authorised_value_category} ) {
-        $field->{authorised_value_choices} = GetAuthorisedValues( $field->{authorised_value_category} );
+my @additional_fields = Koha::AdditionalFields->search({ tablename => 'subscription' });
+my %additional_field_values;
+if ($subscriptionid) {
+    my $subscription = Koha::Subscriptions->find($subscriptionid);
+    foreach my $value ($subscription->additional_field_values->as_list) {
+        $additional_field_values{$value->field_id} = $value->value;
     }
 }
-$template->param( additional_fields_for_subscription => $additional_fields );
+
+$template->param(
+    additional_fields => \@additional_fields,
+    additional_field_values => \%additional_field_values,
+);
 
 my $typeloop = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } };
 
@@ -376,8 +381,24 @@ sub redirect_add_subscription {
         my $result = Koha::SharedContent::send_entity( $query->param('mana_language') || '', $loggedinuser, $subscriptionid, 'subscription');
         $template->param( mana_msg => $result->{msg} );
     }
-    my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription' } );
-    insert_additional_fields( $additional_fields, $biblionumber, $subscriptionid );
+
+    my @additional_fields;
+    my $record = GetMarcBiblio({ biblionumber => $biblionumber, embed_items => 1 });
+    my $subscription_fields = Koha::AdditionalFields->search({ tablename => 'subscription' });
+    while ( my $field = $subscription_fields->next ) {
+        my $value = $query->param('additional_field_' . $field->id);
+        if ($field->marcfield) {
+            my ($field, $subfield) = split /\$/, $field->marcfield;
+            if ( $record and $field and $subfield ) {
+                $value = $record->subfield( $field, $subfield );
+            }
+        }
+        push @additional_fields, {
+            id => $field->id,
+            value => $value,
+        };
+    }
+    Koha::Subscriptions->find($subscriptionid)->set_additional_fields(\@additional_fields);
 
     print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
     return;
@@ -480,34 +501,24 @@ sub redirect_mod_subscription {
         $skip_serialseq, $itemtype, $previousitemtype, $mana_id
     );
 
-    my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription' } );
-    insert_additional_fields( $additional_fields, $biblionumber, $subscriptionid );
-
-    print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
-    return;
-}
-
-sub insert_additional_fields {
-    my ( $additional_fields, $biblionumber, $subscriptionid ) = @_;
-    my $record = GetMarcBiblio({
-        biblionumber => $biblionumber,
-        embed_items  => 1 });
-    for my $field ( @$additional_fields ) {
-        my $af = Koha::AdditionalField->new({ id => $field->{id} })->fetch;
-        if ( $af->{marcfield} ) {
-            my ( $field, $subfield ) = split /\$/, $af->{marcfield};
-            $af->{values} = undef;
-            if ( $field and $subfield ) {
-                my $value = $record->subfield( $field, $subfield );
-                $af->{values} = {
-                    $subscriptionid => $value
-                };
+    my @additional_fields;
+    my $record = GetMarcBiblio({ biblionumber => $biblionumber, embed_items => 1 });
+    my $subscription_fields = Koha::AdditionalFields->search({ tablename => 'subscription' });
+    while ( my $field = $subscription_fields->next ) {
+        my $value = $query->param('additional_field_' . $field->id);
+        if ($field->marcfield) {
+            my ($field, $subfield) = split /\$/, $field->marcfield;
+            if ( $record and $field and $subfield ) {
+                $value = $record->subfield( $field, $subfield );
             }
-        } else {
-            $af->{values} = {
-                $subscriptionid => scalar $query->param('additional_field_' . $field->{id})
-            } if defined $query->param('additional_field_' . $field->{id});
         }
-        $af->insert_values;
+        push @additional_fields, {
+            id => $field->id,
+            value => $value,
+        };
     }
+    Koha::Subscriptions->find($subscriptionid)->set_additional_fields(\@additional_fields);
+
+    print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
+    return;
 }