}
-my $additional_fields = Koha::AdditionalField->all( { table => 'subscription', searchable => 1 } );
+my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription', searchable => 1 } );
my $additional_field_filters;
for my $field ( @$additional_fields ) {
- if ( my $filter_value = $query->param('additional_field_' . $field->{name} . '_filter') ) {
- $additional_field_filters->{ $field->{name} } = $filter_value;
+ 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} );
publisher => $publisher,
bookseller => $bookseller,
branch => $branch,
- additional_fields => [ map{ { name => $_, value => $additional_field_filters->{$_}} } keys %$additional_field_filters ],
+ 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,
}