Bugzilla – Attachment 144068 Details for
Bug 31748
Restore progress bar on record import
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 31748: Restore progress bar on record import
Bug-31748-Restore-progress-bar-on-record-import.patch (text/plain), 2.40 KB, created by
Kyle M Hall (khall)
on 2022-11-18 14:50:30 UTC
(
hide
)
Description:
Bug 31748: Restore progress bar on record import
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2022-11-18 14:50:30 UTC
Size:
2.40 KB
patch
obsolete
>From fe481b04eb77679e72f50095d08cc00f9ee5dbd6 Mon Sep 17 00:00:00 2001 >From: Kyle Hall <kyle@bywatersolutions.com> >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 %] > <div class="dialog message"> > <p>The job has been enqueued! It will be processed as soon as possible.</p> >+ [% INCLUDE "job_progress.inc" job_id=job_id %] > <p><a class="job_details" href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job_id | uri %]" title="View detail of the enqueued job">View detail of the enqueued job</a> > </div> > >@@ -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' %] > <script> > $(document).ready(function() { >@@ -615,14 +622,11 @@ > return confirm(_("Clear all reservoir records staged in this batch? This cannot be undone.")); > } > }); >- [% IF job_enqueued %] >- setTimeout( >- function() { window.location.href=$('a.job_details').attr('href'); }, >- 5000, // 5 secs to read >- ); >- [% END %] > }); > >+ [% IF job_enqueued %] >+ updateProgress([% job_id %]); >+ [% END %] > </script> > [% END %] > [% INCLUDE 'intranet-bottom.inc' %] >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 31748
: 144068