From 33a5a9a146fbdf6d3c99c19e38f37fe2efcc77ea Mon Sep 17 00:00:00 2001 From: Jonathan Druart 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. --- .../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 1bb87d6f49b..47bb5ee81ed 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 %] @@ -253,8 +252,6 @@ [% IF ( can_commit ) %]
- -
[% IF ( record_type != 'auth' ) %] @@ -282,23 +279,13 @@
-
-
Job progress:
0%
-
-
[% END # /IF can_commit %] [% IF ( can_revert ) %]
- -
-
-
Job progress:
0%
-
-
[% END # /IF can_revert %] [% 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 98082506b54..1b92c3b0f24 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 @@ Stage MARC records for import › Cataloging › Koha [% INCLUDE 'doc-head-close.inc' %] [% Asset.css("css/humanmsg.css") | $raw %] -- 2.25.1