Bugzilla – Attachment 78412 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.74 KB, created by
Owen Leonard
on 2018-09-04 16:00:15 UTC
(
hide
)
Description:
Bug 21186: Incorrect Bootstrap modal event name in multiple templates
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2018-09-04 16:00:15 UTC
Size:
10.74 KB
patch
obsolete
>From 621279b0ebf3d76b6c1dc4b53bc9b364f17d9015 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 818eb28..38f94a8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >@@ -563,7 +563,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 | html %]/[% theme | html %]/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 c730c7c..cbbf733 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >@@ -140,7 +140,7 @@ > e.preventDefault(); > EDIModal.modal("hide"); > }); >- EDIModal.on("hidden", function(){ >+ EDIModal.on("hidden.bs.modal", function(){ > EDIModalBody.html("<div id=\"loading\"><img src=\"[% interface | html %]/[% theme | html %]/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 8cd7f36..31d0d33 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >@@ -130,7 +130,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 | html %]/[% theme | html %]/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 3eff906..9e37729 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -545,7 +545,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 | html %]/[% theme | html %]/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 ce02cb6..d4e3653 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -1052,7 +1052,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 | html %]/[% theme | html %]/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 ce3bf76..60ab3f3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >@@ -249,7 +249,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 | html %]/[% theme | html %]/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 a1f8482..de53ace 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >@@ -205,7 +205,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 | html %]/[% theme | html %]/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 a50d609..e623af6 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 >@@ -147,7 +147,7 @@ > patronExportModal.modal("show"); > }); > >- patronExportModal.on("hidden", function(){ >+ patronExportModal.on("hidden.bs.modal", function(){ > patronExportModalBody.html("<div id=\"loading\"><img src=\"[% interface | html %]/[% theme | html %]/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 fb03555..705fcb2 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 >@@ -301,7 +301,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 | html %]/[% theme | html %]/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 c29dafe..630047b 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 >@@ -494,7 +494,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 | html %]/[% theme | html %]/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