From 9f35e9391077b720fb33f36946aec628213c5887 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 6 May 2016 12:15:33 -0400
Subject: [PATCH] Bug 16468 - Remove last "onclick" from the stage MARC records
 template
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This patch reviseds the stage MARC records template, removing
one more "onclick" attribute from the markup and defining that event in
the script.

This patch also corrects a missing quotation mark in the HTML. I have
done some reindentation to that section.

To test, apply the patch and go to Tools -> Stage MARC records for
import.

- Select a MARC file for import.
- Click the "Upload file" button.
- Click the "Stage for import" button. Your import should be correctly
  staged.

Signed-off-by: Claire Gravely <c.gravely@arts.ac.uk>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit dd867b10b81ff34020fb036549bceb815238bea2)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
---
 .../prog/en/modules/tools/stage-marc-import.tt     | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
index af2428149e..529edd5a7b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
@@ -31,6 +31,9 @@ $(document).ready(function(){
         e.preventDefault();
         CancelUpload();
     });
+    $("#mainformsubmit").on("click",function(){
+        return CheckForm( document.getElementById("processfile"));
+    });
 });
 function CheckForm(f) {
     if ($("#fileToUpload").value == '') {
@@ -179,7 +182,14 @@ function cbUpload( status, fileid ) {
     </li>
 	<li>
 		<label for="encoding">Character encoding: </label>
-            <select name="encoding" id="encoding"><option value="utf8" selected="selected">UTF-8 (Default)</option><option value="MARC-8">MARC 8</option><option value="ISO_5426">ISO 5426</option><option value="ISO_6937">ISO 6937</option><option value=ISO_8859-1">ISO 8859-1</option><option value="EUC-KR">EUC-KR</option></select>
+            <select name="encoding" id="encoding">
+                <option value="utf8" selected="selected">UTF-8 (Default)</option>
+                <option value="MARC-8">MARC 8</option>
+                <option value="ISO_5426">ISO 5426</option>
+                <option value="ISO_6937">ISO 6937</option>
+                <option value="ISO_8859-1">ISO 8859-1</option>
+                <option value="EUC-KR">EUC-KR</option>
+            </select>
 	</li>
 </ol></fieldset>
 
@@ -254,7 +264,7 @@ function cbUpload( status, fileid ) {
       </li>
     </ol>
   </fieldset>
-  <fieldset class="action"><input type="button" id="mainformsubmit" onclick="return CheckForm(this.form);" value="Stage for import" /></fieldset>
+  <fieldset class="action"><input type="button" id="mainformsubmit" value="Stage for import" /></fieldset>
  
        <div id="jobpanel"><div id="jobstatus">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
      <div id="jobfailed"></div></div>
-- 
2.39.5