Attachment 151914 Details for Bug 33865 – Bug 33865: (bug 27421 follow-up) Remove leftover

[patch] Bug 33865: (bug 27421 follow-up) Remove leftover

Bug-33865-bug-27421-follow-up-Remove-leftover.patch (text/plain), 5.35 KB, created by Owen Leonard on 2023-06-01 12:15:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2023-06-01 12:15:28 UTC

Size: 5.35 KB

patch

obsolete

>From ffc31111ccb6fbdf5d2ac6a2cb0a9f4ac8f0d6c4 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 1 Jun 2023 08:29:53 +0200
>Subject: [PATCH] Bug 33865: (bug 27421 follow-up) Remove leftover
>
>Bug 27421 replaced the progress bar with job_progress.inc.
>The code related to the old progress bar has not been removed however.
>
>Moreover there was a JS error in the console:
>"Uncaught ReferenceError: submitBackgroundJob is not defined"
>
>Test plan:
>Stage a MARC record for import
>Import it
>Revert the import
>All should work correctly, without JS error in the console and with the
>progress bar displayed nicely during the staging step.
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>---
> .../en/modules/tools/manage-marc-import.tt     | 18 +-----------------
> .../prog/en/modules/tools/stage-marc-import.tt |  2 +-
> 2 files changed, 2 insertions(+), 18 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
>index 1bb87d6f49..47bb5ee81e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
>@@ -11,7 +11,6 @@
> [% INCLUDE 'doc-head-close.inc' %]
> [% Asset.css("css/humanmsg.css") | $raw %]
> <style>
>-    #jobpanel,#jobstatus,#jobfailed { display : none; }
>     span.change-status { font-style:italic; color:#666; display:none; }
>     ul.matches li { list-style-type:none; }
> </style>
>@@ -253,8 +252,6 @@
>                             [% IF ( can_commit ) %]
>                                 <form method="post" id="import_batch_form">
>                                     <input type="hidden" name="op" value="commit-batch" />
>-                                    <input type="hidden" name="runinbackground" value="" />
>-                                    <input type="hidden" name="completedJobID" value="" />
>                                     <input type="hidden" name="import_batch_id" value="[% import_batch_id | html %]" />
>                                     <fieldset class="action">
>                                         [% IF ( record_type != 'auth' ) %]
>@@ -282,23 +279,13 @@
>                                         <input type="submit" class="button" name="mainformsubmit" value="Import this batch into the catalog" />
>                                     </fieldset>
>                                 </form> 
>-                                <div id="jobpanel">
>-                                    <div id="jobstatus" class="progress_panel">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
>-                                    <div id="jobfailed"></div>
>-                                </div>
>                             [% END # /IF can_commit %]
>                             [% IF ( can_revert ) %]
>                                 <form method="post" id="revert_batch_form">
>                                     <input type="hidden" name="op" value="revert-batch" />
>-                                    <input type="hidden" name="runinbackground" value="" />
>-                                    <input type="hidden" name="completedJobID" value="" />
>                                     <input type="hidden" name="import_batch_id" value="[% import_batch_id | html %]" />
>                                     <fieldset class="action"><input type="submit" class="button" name="mainformsubmit" value="Undo import into catalog" /></fieldset>
>                                 </form>
>-                                <div id="jobpanel">
>-                                    <div id="jobstatus">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
>-                                    <div id="jobfailed"></div>
>-                                </div>
>                             [% END # /IF can_revert %]
>                         </div>
>                         [% END %]
>@@ -580,11 +567,8 @@
>                         }
>                     },
>                 }));
>-                $("#import_batch_form").on("submit", function() {
>-                    return submitBackgroundJob(document.getElementById("import_batch_form"));
>-                });
>                 $("#revert_batch_form").on("submit", function() {
>-                    return confirm(_("Are you sure you want to undo the import of this batch into the catalog?")) && submitBackgroundJob(document.getElementById("revert_batch_form"));
>+                    return confirm(_("Are you sure you want to undo the import of this batch into the catalog?"));
>                 });
>             [% END %]
> 
>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 98082506b5..1b92c3b0f2 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
>@@ -5,7 +5,7 @@
> <title>Stage MARC records for import &rsaquo; Cataloging &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> <style>
>-    #fileuploadstatus,#fileuploadfailed,#fileuploadcancel,#jobpanel,#jobstatus,#jobfailed { display : none; }
>+    #fileuploadstatus,#fileuploadfailed,#fileuploadcancel { display : none; }
> </style>
> 
> [% Asset.css("css/humanmsg.css") | $raw %]
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 33865: 151892 | 151914 | 151934