Bugzilla – Attachment 77630 Details for
Bug 21186
Incorrect Bootstrap modal event name in multiple templates
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21186: Incorrect Bootstrap modal event name in multiple templates
Bug-21186-Incorrect-Bootstrap-modal-event-name-in-.patch (text/plain), 10.60 KB, created by
Owen Leonard
on 2018-08-09 15:55:09 UTC
(
hide
)
Description:
Bug 21186: Incorrect Bootstrap modal event name in multiple templates
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2018-08-09 15:55:09 UTC
Size:
10.60 KB
patch
obsolete
>From 31fd1cfc323a50e6cff0c742b8861318075ceef2 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Wed, 8 Aug 2018 19:03:38 +0000 >Subject: [PATCH] Bug 21186: Incorrect Bootstrap modal event name in multiple > templates > >Modals in the staff client which load data via AJAX require an "on >close" action in order to clear the modal of the loaded data. The >problem presents itself the second time the modal is opened: The >"loading" message doesn't appear, and the data from the previous link >is shown until the new data loads. > >To test, apply the patch and test the following pages. In each case, >click multiple instances of the modal trigger link/button to confirm >that the "loading" message always appears between re-displays of the >modal. > >- Acquisitions -> Vendor -> Add to basket -> From a staged file -> Add orders > - Test the "MARC" and "Card" links >- Acquisitions -> EDIFACT messages > - Test the "View message" button >- Acquisitions -> Vendor -> Add to basket -> From an existing record > - Test "View MARC" link >- Acquisitions -> Vendor -> Invoices -> Invoice -> Receipt page > - Test the "Order," "MARC," and "Card" links. >- Catalog -> Bibliographic record details > - Test the MARC Preview link. >- Cataloging -> Cataloging search results > - Test the Actions -> MARC preview and Actions -> Card preview menu > items >- Cataloging -> Cataloging search results -> Merge > - Test the "View MARC" linkscataloguing/merge.tt >- Tools -> Patron lists -> Actions -> Print patron cards >- Tools -> Batch record modification -> Results -> Show MARC >- Tools -> Staged MARC record management -> View batch > - Test MARC preview shown when you click a staged title >--- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt | 2 +- > .../intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt | 2 +- > 10 files changed, 10 insertions(+), 10 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >index 3f5d736..80ff180 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >@@ -562,7 +562,7 @@ > $("#dataPreview .modal-body").load(page + " div"); > $('#dataPreview').modal({show:true}); > }); >- $("#dataPreview").on("hidden", function(){ >+ $("#dataPreview").on("hidden.bs.modal", function(){ > $("#dataPreviewLabel").html(""); > $("#dataPreview .modal-body").html("<div id=\"loading\"><img src=\"[% interface %]/[% theme %]/img/spinner-small.gif\" alt=\"\" /> "+_("Loading")+"</div>"); > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >index bdf9faf..e8dc0ac 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >@@ -139,7 +139,7 @@ > e.preventDefault(); > EDIModal.modal("hide"); > }); >- EDIModal.on("hidden", function(){ >+ EDIModal.on("hidden.bs.modal", function(){ > EDIModalBody.html("<div id=\"loading\"><img src=\"[% interface %]/[% theme %]/img/spinner-small.gif\" alt=\"\" /> "+_("Loading")+"</div>"); > }); > $(".delete_msg").on("click",function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >index 877e41a..efa13e0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >@@ -127,7 +127,7 @@ > $("#marcPreview .modal-body").load(page + " table"); > $('#marcPreview').modal({show:true}); > }); >- $("#marcPreview").on("hidden", function(){ >+ $("#marcPreview").on("hidden.bs.modal", function(){ > $("#marcPreviewLabel").html(""); > $("#marcPreview .modal-body").html("<div id=\"loading\"><img src=\"[% interface %]/[% theme %]/img/spinner-small.gif\" alt=\"\" /> "+_("Loading")+"</div>"); > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >index 37a35af..d74a144 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -535,7 +535,7 @@ > $("#dataPreview .modal-body").load(page + " div"); > $('#dataPreview').modal({show:true}); > }); >- $("#dataPreview").on("hidden", function(){ >+ $("#dataPreview").on("hidden.bs.modal", function(){ > $("#dataPreviewLabel").html(""); > $("#dataPreview .modal-body").html("<div id=\"loading\"><img src=\"[% interface %]/[% theme %]/img/spinner-small.gif\" alt=\"\" /> "+_("Loading")+"</div>"); > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >index e4da23a..d58ef75 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -1038,7 +1038,7 @@ > $("#marcPreview .modal-body").load(page + " table"); > $('#marcPreview').modal({show:true}); > }); >- $("#marcPreview").on("hidden", function(){ >+ $("#marcPreview").on("hidden.bs.modal", function(){ > $("#marcPreview .modal-body").html("<div id=\"loading\"><img src=\"[% interface %]/[% theme %]/img/spinner-small.gif\" alt=\"\" /> "+_("Loading")+"</div>"); > }); > [% IF ( Koha.Preference('NovelistSelectStaffEnabled') && Koha.Preference('NovelistSelectStaffProfile') && ( normalized_isbn || normalized_upc ) ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >index 7305bd5..8bace55 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >@@ -248,7 +248,7 @@ > $("#dataPreview .modal-body").load(page + " div"); > $('#dataPreview').modal({show:true}); > }); >- $("#dataPreview").on("hidden", function(){ >+ $("#dataPreview").on("hidden.bs.modal", function(){ > $("#dataPreviewLabel").html(""); > $("#dataPreview .modal-body").html("<div id=\"loading\"><img src=\"[% interface %]/[% theme %]/img/spinner-small.gif\" alt=\"\" /> "+_("Loading")+"</div>"); > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >index c94d88d..1bad44d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >@@ -204,7 +204,7 @@ div#result { margin-top: 1em; } > $("#dataPreview .modal-body").load(page + " div"); > $('#dataPreview').modal({show:true}); > }); >- $("#dataPreview").on("hidden", function(){ >+ $("#dataPreview").on("hidden.bs.modal", function(){ > $("#dataPreviewLabel").html(""); > $("#dataPreview .modal-body").html("<div id=\"loading\"><img src=\"[% interface %]/[% theme %]/img/spinner-small.gif\" alt=\"\" /> "+_("Loading")+"</div>"); > }); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >index b6057a6..b741e74 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >@@ -146,7 +146,7 @@ > patronExportModal.modal("show"); > }); > >- patronExportModal.on("hidden", function(){ >+ patronExportModal.on("hidden.bs.modal", function(){ > patronExportModalBody.html("<div id=\"loading\"><img src=\"[% interface %]/[% theme %]/img/spinner-small.gif\" alt=\"\" /> "+_("Loading")+"</div>"); > }); > >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 bb0962d..c900ef5 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 >@@ -300,7 +300,7 @@ > $("#marcPreview .modal-body").load(page + " div"); > $('#marcPreview').modal({show:true}); > }); >- $("#marcPreview").on("hidden", function(){ >+ $("#marcPreview").on("hidden.bs.modal", function(){ > $("#marcPreviewLabel").html(""); > $("#marcPreview .modal-body").html("<div id=\"loading\"><img src=\"[% interface %]/[% theme %]/img/spinner-small.gif\" alt=\"\" /> "+_("Loading")+"</div>"); > }); >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 cff595a..c109b01 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 >@@ -493,7 +493,7 @@ > $("#marcPreview .modal-body").load(page + " table"); > $('#marcPreview').modal({show:true}); > }); >- $("#marcPreview").on("hidden", function(){ >+ $("#marcPreview").on("hidden.bs.modal", function(){ > $("#marcPreviewLabel").html(""); > $("#marcPreview .modal-body").html("<div id=\"loading\"><img src=\"[% interface %]/[% theme %]/img/spinner-small.gif\" alt=\"\" /> "+_("Loading")+"</div>"); > }); >-- >2.1.4
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 21186
:
77630
|
78412
|
81182
|
81189
|
81190
|
81369
|
81370