From 1ce4730d374c57e5e6f9abffe1bff112a8485cc5 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 12 Nov 2018 14:50:31 -0300
Subject: [PATCH] Bug 12759: Pass records from selected tab

To remove ambiguity we should not process the records from other tabs.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 .../en/modules/tools/batch_delete_records.tt  | 65 ++++++++++++-------
 .../tools/batch_record_modification.tt        | 64 +++++++++++-------
 2 files changed, 81 insertions(+), 48 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt
index 5e57f8610f..5bd351381f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt
@@ -57,7 +57,7 @@
     </div>
   [% END %]
   [% IF op == 'form' %]
-    <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/batch_delete_records.pl">
+    <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/batch_delete_records.pl" id="record_ids_selection">
       <fieldset class="rows">
         <legend>Record type</legend>
         <ol>
@@ -70,12 +70,12 @@
 
       <div id="batch_del_form" class="toptabs">
         <ul>
-          <li><a href="#uploadfile">Upload a file</a></li>
-          [% IF lists.count %]<li id="show_list_option"><a href="#shelves">Select a list of records</a></li>[% END %]
-          <li><a href="#enterlist">Enter a list of record numbers</a></li>
+          <li><a href="#uploadfile_tab">Upload a file</a></li>
+          [% IF lists.count %]<li id="show_list_option"><a href="#shelves_tab">Select a list of records</a></li>[% END %]
+          <li><a href="#enterlist_tab">Enter a list of record numbers</a></li>
         </ul>
 
-        <div id="uploadfile">
+        <div id="uploadfile_tab">
           <fieldset class="rows">
             <legend>Use a file</legend>
             <ol>
@@ -85,26 +85,28 @@
           &nbsp;
         </div>
 
-        <div id="shelves">
-          <fieldset class="rows">
-            <legend>Or select a list of records</legend>
-            <ol>
-              <li>
-                <label for="shelf_number">Use records from the following list: </label>
-                <select name="shelf_number" id="shelf_number">
-                  <option value="">Select a list</option>
-                    [% FOREACH list IN lists %]
-                      <option value="[% list.shelfnumber %]">[% list.shelfname %]</option>
-                    [% END %]
-                  </option>
-                </select>
-              </li>
-            </ol>
-          </fieldset>
-          &nbsp;
-        </div>
+        [% IF lists.count %]
+            <div id="shelves_tab">
+              <fieldset class="rows">
+                <legend>Or select a list of records</legend>
+                <ol>
+                  <li>
+                    <label for="shelf_number">Use records from the following list: </label>
+                    <select name="shelf_number" id="shelf_number">
+                      <option value="">Select a list</option>
+                        [% FOREACH list IN lists %]
+                          <option value="[% list.shelfnumber %]">[% list.shelfname %]</option>
+                        [% END %]
+                      </option>
+                    </select>
+                  </li>
+                </ol>
+              </fieldset>
+              &nbsp;
+            </div>
+        [% END %]
 
-        <div id="enterlist">
+        <div id="enterlist_tab">
           <fieldset class="rows">
             <legend>Or enter a list of record numbers</legend>
             <ol>
@@ -306,6 +308,21 @@
               return false;
             }
           });
+
+          $("#record_ids_selection").on("submit", function(e){
+            var tab = $(this).find('.ui-tabs-active:first a').attr('href');
+            if ( tab == '#uploadfile_tab' ) {
+                $("#shelf_number").empty('');
+                $("#recordnumber_list").val('');
+            } else if ( tab == '#shelves_tab' ) {
+                $("#uploadfile").val('')
+                $("#recordnumber_list").val('');
+            } else { // enterlist
+                $("#uploadfile").val('')
+                $("#shelf_number").empty('');
+            }
+          });
+
         });
     </script>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt
index a8f9b7cc53..652c74e53f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt
@@ -61,7 +61,7 @@
     [% END %]
 
   [% IF view == 'form' %]
-    <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/batch_record_modification.pl">
+    <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/tools/batch_record_modification.pl" id="record_ids_selection">
       <fieldset class="rows">
         <legend>Record type</legend>
         <ol>
@@ -74,12 +74,12 @@
 
       <div id="batch_mod_form" class="toptabs">
         <ul>
-          <li><a href="#uploadfile">Upload a file</a></li>
-          [% IF lists.count %]<li id="show_list_option"><a href="#shelves">Select a list of records</a></li>[% END %]
-          <li><a href="#enterlist">Enter a list of record numbers</a></li>
+          <li><a href="#uploadfile_tab">Upload a file</a></li>
+          [% IF lists.count %]<li id="show_list_option"><a href="#shelves_tab">Select a list of records</a></li>[% END %]
+          <li><a href="#enterlist_tab">Enter a list of record numbers</a></li>
         </ul>
 
-        <div id="uploadfile">
+        <div id="uploadfile_tab">
           <fieldset class="rows">
             <legend>Use a file</legend>
             <ol>
@@ -89,26 +89,28 @@
           &nbsp;
         </div>
 
-        <div id="shelves">
-          <fieldset class="rows">
-            <legend>Or select a list of records</legend>
-            <ol>
-              <li>
-                <label for="shelf_number">Use records from the following list: </label>
-                <select name="shelf_number" id="shelf_number">
-                  <option value="">Select a list</option>
-                    [% FOREACH list IN lists %]
-                      <option value="[% list.shelfnumber %]">[% list.shelfname %]</option>
-                    [% END %]
-                  </option>
-                </select>
-              </li>
-            </ol>
-          </fieldset>
-          &nbsp;
-        </div>
+        [% IF lists.count %]
+            <div id="shelves_tab">
+              <fieldset class="rows">
+                <legend>Or select a list of records</legend>
+                <ol>
+                  <li>
+                    <label for="shelf_number">Use records from the following list: </label>
+                    <select name="shelf_number" id="shelf_number">
+                      <option value="">Select a list</option>
+                        [% FOREACH list IN lists %]
+                          <option value="[% list.shelfnumber %]">[% list.shelfname %]</option>
+                        [% END %]
+                      </option>
+                    </select>
+                  </li>
+                </ol>
+              </fieldset>
+              &nbsp;
+            </div>
+        [% END %]
 
-        <div id="enterlist">
+        <div id="enterlist_tab">
           <fieldset class="rows">
             <legend>Or enter a list of record numbers</legend>
             <ol>
@@ -338,6 +340,20 @@
             return submitBackgroundJob(document.getElementById("process"));
           });
 
+          $("#record_ids_selection").on("submit", function(e){
+            var tab = $(this).find('.ui-tabs-active:first a').attr('href');
+            if ( tab == '#uploadfile_tab' ) {
+                $("#shelf_number").empty('');
+                $("#recordnumber_list").val('');
+            } else if ( tab == '#shelves_tab' ) {
+                $("#uploadfile").val('')
+                $("#recordnumber_list").val('');
+            } else { // enterlist
+                $("#uploadfile").val('')
+                $("#shelf_number").empty('');
+            }
+          });
+
           $("#marc_modification_template_id").change(function(){
             var url = "/cgi-bin/koha/svc/records/preview?"
             var mmtid = $(this).val();
-- 
2.39.5