From fe481b04eb77679e72f50095d08cc00f9ee5dbd6 Mon Sep 17 00:00:00 2001 From: Kyle Hall Date: Fri, 18 Nov 2022 09:42:32 -0500 Subject: [PATCH] Bug 31748: Restore progress bar on record import Test Plan: 1) Apply this patch 2) Upload a marc batch 3) Import the marc batch 4) Note that under the message "The job has been enqueued! It will be processed as soon as possible." There is now a functioning progress bar and the page no longer redirects automatically. --- .../prog/en/modules/tools/manage-marc-import.tt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 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 e4a46a5ef8..ee2a91cf2f 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 @@ -80,6 +80,7 @@ [% IF job_enqueued %]

The job has been enqueued! It will be processed as soon as possible.

+ [% INCLUDE "job_progress.inc" job_id=job_id %]

View detail of the enqueued job

@@ -426,6 +427,12 @@ [% MACRO jsinclude BLOCK %] [% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %] + + [% INCLUDE 'str/job_progess.inc' job_id=job_id %] + [% Asset.js("js/job_progess.js") | $raw %] + + [% Asset.js("js/background-job-progressbar.js") | $raw %] + [% INCLUDE 'datatables.inc' %] [% END %] [% INCLUDE 'intranet-bottom.inc' %] -- 2.30.2