From bba0044e8ed4cf541d38781950773c1416422b0c Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 10 Oct 2018 12:10:45 +0000
Subject: [PATCH] Bug 21531: Subscription "New fields" button should read "New
 field"

This patch changes the label of the "New fields" button on the
subscription add fields page to read "New field," making it consistent
with similar buttons in the staff client.

Also changed:

- Add missing id to <select> to make label clickable.
- Remove custom DataTables configuration in favor of defaults.

To test, apply the patch and go to Serials -> Add subscription fields.

- The button in the toolbar should read "New field."
- The DataTables' functionality of the table of existing custom fields
  should be correct.
- Click the "New field" button.
  - Cliking the "Authorised value category" label should put the focus
    on the dropdown.

Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 .../intranet-tmpl/prog/en/modules/serials/add_fields.tt   | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt
index 0c88a8d8f7..3acef195fe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt
@@ -30,7 +30,7 @@
 
   [% IF op == 'list' %]
     <div id="toolbar" class="btn-toolbar">
-      <a class="btn btn-default btn-sm" id="newfields" href="/cgi-bin/koha/serials/add_fields.pl?op=add_form"><i class="fa fa-plus"></i> New fields</a>
+      <a class="btn btn-default btn-sm" id="newfields" href="/cgi-bin/koha/serials/add_fields.pl?op=add_form"><i class="fa fa-plus"></i> New field</a>
     </div>
   [% END %]
 
@@ -107,7 +107,7 @@
           </li>
           <li>
             <label for="av">Authorised value category: </label>
-            <select name="authorised_value_category">
+            <select id="av" name="authorised_value_category">
               <option value="">None</option>
               [% PROCESS options_for_authorised_value_categories authorised_value_categories => AuthorisedValues.GetCategories( selected => field.authorised_value_category ) %]
             </select>
@@ -154,11 +154,7 @@
 
             $("#fieldst").dataTable($.extend(true, {}, dataTablesDefaults, {
                 'bAutoWidth': false,
-                'sDom': 't<"bottom pager"ilpf>',
                 'sPaginationType': 'four_button',
-                'aLengthMenu': [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]],
-                'iDisplayLength': 20,
-                'aaSorting': [[ 0, "asc" ]],
                 "aoColumnDefs": [
                     { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
                 ]
-- 
2.39.2