@@ -, +, @@
subscriptions
---
.../prog/en/modules/serials/serials-search.tt | 29 ++++++++++++++------
serials/serials-search.pl | 2 +-
2 files changed, 22 insertions(+), 9 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
@@ -97,16 +97,16 @@
[% FOR field IN additional_fields_for_subscription %]
- [% field.name %]:
+ [% field.name %]:
[% IF field.authorised_value_choices %]
-
+
All
[% FOREACH av IN field.authorised_value_choices %]
[% av.lib %]
[% END %]
[% ELSE %]
-
+
[% END %]
[% END %]
@@ -184,8 +184,6 @@
[% IF ( subscription.enddate ) %][% subscription.enddate | $KohaDates %][% END %]
- [% IF ( routing && CAN_user_serials_routing ) %]
- [% END %]
[% FOR field IN additional_fields_for_subscription %]
[% IF field.authorised_value_category %]
[% KohaAuthorisedValues.GetByCode( field.authorised_value_category, subscription.additional_fields.${field.name} ) %]
@@ -195,6 +193,7 @@
[% END %]
Issue history
+ [% IF ( routing && CAN_user_serials_routing ) %]
[% IF ( subscription.cannotedit ) %]
@@ -207,6 +206,7 @@
[% END %]
[% END %]
+ [% END %]
[% IF ( subscription.cannotedit ) %]
@@ -235,6 +235,9 @@
Notes
Library
Call number
+ [% FOR field IN additional_fields_for_subscription %]
+ [% field.name %]
+ [% END %]
@@ -246,6 +249,9 @@
+ [% FOR field IN additional_fields_for_subscription %]
+
+ [% END %]
@@ -271,6 +277,13 @@
[% IF ( subscription.callnumber ) %][% subscription.callnumber %][% END %]
+ [% FOR field IN additional_fields_for_subscription %]
+ [% IF field.authorised_value_category %]
+ [% KohaAuthorisedValues.GetByCode( field.authorised_value_category, subscription.additional_fields.${field.name} ) %]
+ [% ELSE %]
+ [% subscription.additional_fields.${field.name} %]
+ [% END %]
+ [% END %]
[% UNLESS subscription.cannotedit %]
Reopen
@@ -346,9 +359,9 @@
[% FOR field IN additional_fields_for_subscription %]
- [% field.name %]:
+ [% field.name %]:
[% IF field.authorised_value_choices %]
-
+
All
[% FOREACH av IN field.authorised_value_choices %]
[% IF av.authorised_value == additional_field_filters.${field.name} %]
@@ -359,7 +372,7 @@
[% END %]
[% ELSE %]
-
+
[% END %]
[% END %]
--- a/serials/serials-search.pl
+++ a/serials/serials-search.pl
@@ -76,7 +76,7 @@ if ( $op and $op eq "close" ) {
my $additional_fields = Koha::AdditionalField->all( { table => 'subscription', searchable => 1 } );
my $additional_field_filters;
for my $field ( @$additional_fields ) {
- if ( my $filter_value = $query->param('additional_field_' . $field->{name} . '_filter') ) {
+ if ( my $filter_value = $query->param('additional_field_' . $field->{id} . '_filter') ) {
$additional_field_filters->{ $field->{name} } = $filter_value;
}
if ( $field->{authorised_value_category} ) {
--