From a2275d64bfd4feeef07aff11ff02d76ce5fb4319 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Thu, 24 Oct 2013 16:15:57 +0200
Subject: [PATCH] Bug 10855: FIX: Add additional fields for closed
 subscriptions

---
 .../prog/en/modules/serials/serials-search.tt      |   29 ++++++++++++++------
 serials/serials-search.pl                          |    2 +-
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
index 77a7cc0..5f826c7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
@@ -97,16 +97,16 @@
                 </li>
                 [% FOR field IN additional_fields_for_subscription %]
                   <li>
-                    <label for="additional_field_[% field.name %]"> [% field.name %]: </label>
+                    <label for="additional_field_[% field.id %]"> [% field.name %]: </label>
                     [% IF field.authorised_value_choices %]
-                      <select id="additional_field_[% field.name %]" name="additional_field_[% field.name %]_filter">
+                      <select id="additional_field_[% field.id %]" name="additional_field_[% field.id %]_filter">
                         <option value="">All</option>
                         [% FOREACH av IN field.authorised_value_choices %]
                           <option value="[% av.authorised_value %]">[% av.lib %]</option>
                         [% END %]
                       </select>
                     [% ELSE %]
-                      <input id="additional_field_[% field.name %]" type="text" value="[% additional_fields.${field.name} %]" name="additional_field_[% field.name %]_filter" />
+                      <input id="additional_field_[% field.id %]" type="text" value="[% additional_fields.${field.name} %]" name="additional_field_[% field.id %]_filter" />
                     [% END %]
                   </li>
                 [% END %]
@@ -185,8 +185,6 @@
                         <td>
                           [% IF ( subscription.enddate ) %][% subscription.enddate | $KohaDates %][% END %]
                         </td>
-                        [% IF ( routing && CAN_user_serials_routing ) %]
-                        [% END %]
                         [% FOR field IN additional_fields_for_subscription %]
                           [% IF field.authorised_value_category %]
                             <td>[% KohaAuthorisedValues.GetByCode( field.authorised_value_category, subscription.additional_fields.${field.name} ) %]</td>
@@ -196,6 +194,7 @@
                         [% END %]
                         <td><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]">Issue history</a>
                         </td>
+                        [% IF ( routing && CAN_user_serials_routing ) %]
                         <td>
                           [% IF ( subscription.cannotedit ) %]
                             &nbsp;
@@ -208,6 +207,7 @@
                             [% END %]
                           [% END %]
                         </td>
+                        [% END %]
                         <td>
                         [% IF ( CAN_user_serials_receive_serials ) %]
                           <a href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscription.subscriptionid %]&amp;serstatus=1,3,7">Serial receive</a>
@@ -235,6 +235,9 @@
                         <th> Notes </th>
                         <th>Library</th>
                         <th>Call number</th>
+                        [% FOR field IN additional_fields_for_subscription %]
+                          <th>[% field.name %]</th>
+                        [% END %]
                         <th>&nbsp;</th>
                         <th>&nbsp;</th>
                     </tr>
@@ -246,6 +249,9 @@
                       <td><input type="text" class="filter" data-column_num="2" placeholder="Search notes" /></td>
                       <td><input type="text" class="filter" data-column_num="3" placeholder="Search library" /></td>
                       <td><input type="text" class="filter" data-column_num="4" placeholder="Search callnumber" /></td>
+                      [% FOR field IN additional_fields_for_subscription %]
+                        <td><input type="text" class="filter" data-column_num="[% loop.count + 4 %]" placeholder="Search [% field.name %]" /></td>
+                      [% END %]
                       <td></td>
                       <td></td>
                     </tr>
@@ -272,6 +278,13 @@
                         <td>
                           [% IF ( subscription.callnumber ) %][% subscription.callnumber %][% END %]
                         </td>
+                        [% FOR field IN additional_fields_for_subscription %]
+                          [% IF field.authorised_value_category %]
+                            <td>[% KohaAuthorisedValues.GetByCode( field.authorised_value_category, subscription.additional_fields.${field.name} ) %]</td>
+                          [% ELSE %]
+                            <td>[% subscription.additional_fields.${field.name} %]</td>
+                          [% END %]
+                        [% END %]
                         <td>
                           [% UNLESS subscription.cannotedit %]
                             <a href="/cgi-bin/koha/serials/serials-search.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=reopen&amp;routing=[% subscription.routing %]&amp;searched=1&amp;title_filter=[% title_filter %]&amp;ISSN_filter=[% ISSN_filter %]&amp;EAN_filter=[% EAN_filter %]&amp;published_filter=[% publisher_filter %]&amp;bookseller_filter=[% bookseller_filter %]&amp;branch_filter=[% branch_filter %]" id="reopensub">Reopen</a>
@@ -348,9 +361,9 @@
                 </li>
                 [% FOR field IN additional_fields_for_subscription %]
                   <li>
-                    <label for="additional_field_[% field.name %]"> [% field.name %]: </label>
+                    <label for="additional_field_[% field.id %]ID"> [% field.name %]: </label>
                     [% IF field.authorised_value_choices %]
-                      <select id="additional_field_[% field.name %]" name="additional_field_[% field.name %]_filter">
+                      <select id="additional_field_[% field.id %]" name="additional_field_[% field.id %]_filter">
                         <option value="">All</option>
                         [% FOREACH av IN field.authorised_value_choices %]
                           [% IF av.authorised_value == additional_field_filters.${field.name} %]
@@ -361,7 +374,7 @@
                         [% END %]
                       </select>
                     [% ELSE %]
-                      <input id="additional_field_[% field.name %]" type="text" value="[% additional_field_filters.${field.name} %]" name="additional_field_[% field.name %]_filter" />
+                      <input id="additional_field_[% field.id %]" type="text" value="[% additional_field_filters.${field.name} %]" name="additional_field_[% field.id %]_filter" />
                     [% END %]
                   </li>
                 [% END %]
diff --git a/serials/serials-search.pl b/serials/serials-search.pl
index 7b3967d..50dab9a 100755
--- a/serials/serials-search.pl
+++ b/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} ) {
-- 
1.7.10.4