From c376bb75613f5c5b62fd8618012c9dfd96153b44 Mon Sep 17 00:00:00 2001 From: Emily Lamancusa Date: Tue, 15 Apr 2025 13:39:31 -0400 Subject: [PATCH] Bug 39567: Include form-submit code from opac-bottom.inc (OPAC) Import the form-submit.js script in the global includes file for the OPAC, so that all pages have access to it without needing to import it directly. This patch also aligns the OPAC copy of form-submit.js to the staff interface copy, as the OPAC copy is missing 3 lines to support opening the link in a new tab (added to the staff interface copy in bug 37192). --- .../bootstrap/en/includes/opac-bottom.inc | 7 +++ .../opac-tmpl/bootstrap/js/form-submit.js | 62 +++++++++---------- 2 files changed, 38 insertions(+), 31 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc index 76b0e7f4ca..97952ecc04 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc @@ -102,6 +102,13 @@ let logged_in_user_id = "[% logged_in_user.borrowernumber | html %]"; [% Asset.js("js/global.js") | $raw %] + [% IF ( OPACAmazonCoverImages || SyndeticsCoverImages ) %] [% Asset.js("js/amazonimages.js") | $raw %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/js/form-submit.js b/koha-tmpl/opac-tmpl/bootstrap/js/form-submit.js index cb8fc2a261..30855ff297 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/js/form-submit.js +++ b/koha-tmpl/opac-tmpl/bootstrap/js/form-submit.js @@ -1,35 +1,35 @@ -$(document).ready(function () { - $(".submit-form-link").click(function (e) { - e.preventDefault(); - let form_data = $(this).data(); +export function submit_form(form) { + let form_data = $(form).data(); - let confirm_msg = form_data.confirmationMsg; - if (confirm_msg) { - let confirmation = confirm(confirm_msg); - if (!confirmation) { - return false; - } - delete form_data.confirmationMsg; + let confirm_msg = form_data.confirmationMsg; + if (confirm_msg) { + let confirmation = confirm(confirm_msg); + if (!confirmation) { + return false; } + delete form_data.confirmationMsg; + } - let the_form = $("
"); - if (form_data.method === "post") { - form_data.csrf_token = $('meta[name="csrf-token"]').attr("content"); - } - the_form.attr("method", form_data.method); - the_form.attr("action", form_data.action); - delete form_data.method; - delete form_data.action; - $.each(form_data, function (key, value) { - the_form.append( - $("", { - type: "hidden", - name: key, - value: value, - }) - ); - }); - $("body").append(the_form); - the_form.submit(); + let the_form = $(""); + if (form_data.method === "post") { + form_data.csrf_token = $('meta[name="csrf-token"]').attr("content"); + } + the_form.attr("method", form_data.method); + the_form.attr("action", form_data.action); + delete form_data.method; + delete form_data.action; + $.each(form_data, function (key, value) { + the_form.append( + $("", { + type: "hidden", + name: key, + value: value, + }) + ); }); -}); + if (form_data.new_tab) { + the_form.attr("target", "_blank"); + } + $("body").append(the_form); + the_form.submit(); +} -- 2.34.1