Bug 8438: Users can only claim for serials related to their branch.

[koha_ffzg] / serials / serials-search.pl

diff --git a/serials/serials-search.pl b/serials/serials-search.pl
index 27ccd42..3e73c56 100755 (executable)
--- a/serials/serials-search.pl
+++ b/serials/serials-search.pl
@@ -33,8 +33,10 @@ use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Branch;
 use C4::Context;
+use C4::Koha qw( GetAuthorisedValues );
 use C4::Output;
 use C4::Serials;
+use Koha::AdditionalField;
 
 use Koha::DateUtils;
 
@@ -75,6 +77,22 @@ if ( $op and $op eq "close" ) {
     }
 }
 
+
+my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription', searchable => 1 } );
+my $additional_field_filters;
+for my $field ( @$additional_fields ) {
+    my $filter_value = $query->param('additional_field_' . $field->{id} . '_filter');
+    if ( defined $filter_value and $filter_value ne q|| ) {
+        $additional_field_filters->{ $field->{name} } = {
+            value => $filter_value,
+            authorised_value_category => $field->{authorised_value_category},
+        };
+    }
+    if ( $field->{authorised_value_category} ) {
+        $field->{authorised_value_choices} = GetAuthorisedValues( $field->{authorised_value_category} );
+    }
+}
+
 my $expiration_date_dt = $expiration_date ? dt_from_string( $expiration_date ) : undef;
 my @subscriptions;
 if ($searched){
@@ -88,6 +106,7 @@ if ($searched){
             publisher    => $publisher,
             bookseller   => $bookseller,
             branch       => $branch,
+            additional_fields => [ map{ { name => $_, value => $additional_field_filters->{$_}{value}, authorised_value_category => $additional_field_filters->{$_}{authorised_value_category} } } keys %$additional_field_filters ],
             location     => $location,
             expiration_date => $expiration_date_dt,
         }
@@ -141,6 +160,8 @@ $template->param(
     branches_loop => \@branches_loop,
     done_searched => $searched,
     routing       => $routing,
+    additional_field_filters => $additional_field_filters,
+    additional_fields_for_subscription => $additional_fields,
     marcflavour   => (uc(C4::Context->preference("marcflavour")))
 );