Bugzilla – Attachment 99786 Details for
Bug 23753
Add missing humanMsg library to pages using background job JavaScript
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23753: Add missing humanMsg library to pages using background job JavaScript
Bug-23753-Add-missing-humanMsg-library-to-pages-us.patch (text/plain), 6.12 KB, created by
Owen Leonard
on 2020-02-28 16:50:33 UTC
(
hide
)
Description:
Bug 23753: Add missing humanMsg library to pages using background job JavaScript
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2020-02-28 16:50:33 UTC
Size:
6.12 KB
patch
obsolete
>From 14443c627c021a21840f21933b5c08af9d81fda0 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 28 Feb 2020 16:48:37 +0000 >Subject: [PATCH] Bug 23753: Add missing humanMsg library to pages using > background job JavaScript > >The JavaScript used to process background uploads calls the humanMsg >library under some circumstances. There are several templates which use >background-job-progressbar.js which don't include the humanMsg assets. >This patch corrects those templates. > >Note: upload-images.tt has been modified to remove the inclusion of >background-job-progressbar.js because it was unused. > >To test, apply the patch and test the following processes which include >background job processing: > > - Batch item modification -- the background job is triggered when you > submit your changes > - Batch record modification -- the background job is triggered when you > submit your changes > - Stage MARC for import -- the background job is triggered when you > click the "Sage for import" button after uploading a file > - Staged MARC management -- the background job is triggered when you > click "Import this batch into the catalog" > >In each case the process should complete correctly. If you would like to >test the error message handling provided by the humanMsg library you can >deliberately introduce an error into the JavaScript. After applying the >patch you can modify js/background-job-progressbar.js to alter line 63 >from: > > url: f.action, > >...to: > > url: f.action + "foo", > >Perform the same tests and confirm that you see an error message. Don't >forget to undo your changes to background-job-progressbar.js before >signing off. >--- > koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt | 3 ++- > .../intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt | 2 ++ > koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt | 2 ++ > koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt | 1 - > 5 files changed, 7 insertions(+), 3 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >index 965722e5d1d..e34cee89a07 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >@@ -4,6 +4,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Batch item modification</title> > [% INCLUDE 'doc-head-close.inc' %] >+[% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %] > [% Asset.js("js/background-job-progressbar.js") | $raw %] > [% Asset.js("js/cataloging.js") | $raw %] > [% INCLUDE 'datatables.inc' %] >@@ -64,7 +65,7 @@ $(document).ready(function(){ > <![endif]--> > <style>input[type=checkbox]{ margin : 0 .5em; }</style> > [% Asset.css("css/addbiblio.css") | $raw %] >- >+[% Asset.css("css/humanmsg.css") | $raw %] > [% INCLUDE 'select2.inc' %] > <script type="text/javascript"> > $(document).ready(function() { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >index 95d89198716..3d645573709 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >@@ -5,6 +5,7 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Tools › Batch record modification</title> > [% INCLUDE 'doc-head-close.inc' %] >+[% Asset.css("css/humanmsg.css") | $raw %] > </head> > > <body id="tools_batch_record_modification" class="tools"> >@@ -284,6 +285,7 @@ > [% Asset.js("js/tools-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] > [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %] >+ [% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %] > [% Asset.js("js/background-job-progressbar.js") | $raw %] > <script> > $(document).ready(function() { >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 79c169ec108..0fde39f7a6a 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 >@@ -8,6 +8,7 @@ > [% END %] > </title> > [% 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; } >@@ -421,6 +422,7 @@ > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/tools-menu.js") | $raw %] >+ [% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %] > [% Asset.js("js/background-job-progressbar.js") | $raw %] > [% INCLUDE 'datatables.inc' %] > <script> >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 193d6131596..9cffac53863 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 >@@ -213,9 +213,9 @@ > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/tools-menu.js") | $raw %] >+ [% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %] > [% Asset.js("js/background-job-progressbar.js") | $raw %] > [% Asset.js("js/file-upload.js") | $raw %] >- [% Asset.js("lib/jquery/plugins/humanmsg.js") | $raw %] > <script> > var xhr; > $(document).ready(function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >index b3418007026..ac771fd61ee 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >@@ -114,7 +114,6 @@ > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/tools-menu.js") | $raw %] >- [% Asset.js("js/background-job-progressbar.js") | $raw %] > [% Asset.js("js/file-upload.js") | $raw %] > <script> > function StartUpload() { >-- >2.11.0
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 23753
:
94027
|
99786
|
99790
|
99828