Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

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

Browse source 
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>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Jonathan Druart 2023-06-01 08:29:53 +02:00 committed by Tomas Cohen Arazi
parent db85bf444a
commit e09f54435a
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F
2 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
View file

@ -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> <!-- /#import_batch_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 %]

2
koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
View file

@ -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 %]