Attachment 169155 Details for Bug 37270 – Bug 37270: (follow-up) Fix mixed quotes in preview modal JS

[patch] Bug 37270: (follow-up) Fix mixed quotes in preview modal JS

Bug-37270-follow-up-Fix-mixed-quotes-in-preview-mo.patch (text/plain), 5.41 KB, created by Owen Leonard on 2024-07-18 16:55:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2024-07-18 16:55:13 UTC

Size: 5.41 KB

patch

obsolete

>From b4b664c676ce4a8c6b1d8f609522abb63a3e7e30 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 18 Jul 2024 14:58:29 +0000
>Subject: [PATCH] Bug 37270: (follow-up) Fix mixed quotes in preview modal JS
>
>---
> .../modules/reports/guided_reports_start.tt   | 32 +++++++++----------
> 1 file changed, 16 insertions(+), 16 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
>index 17fda2b0b5..c177c6740b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
>@@ -2443,28 +2443,28 @@
>             if( $("#preview-sql-modal").length > 0) {
>                 $("#preview-sql-modal").remove();
>             }
>-            $("body").append('<div id="preview-sql-modal" tabindex="-1" role="dialog" aria-hidden="true" class="modal">\
>-                <div class="modal-dialog">\
>-                    <div class="modal-content">\
>-                        <div class="modal-header" style="min-height:40px;">\
>-                            <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close">\
>-                                <span aria-hidden="true">Ã</span>\
>+            $("body").append("<div id=\"preview-sql-modal\" tabindex=\"-1\" role=\"dialog\" aria-hidden=\"true\" class=\"modal\">\
>+                <div class=\"modal-dialog\">\
>+                    <div class=\"modal-content\">\
>+                        <div class=\"modal-header\" style=\"min-height:40px;\">\
>+                            <button type=\"button\" class=\"closebtn\" data-dismiss=\"modal\" aria-label=\"Close\">\
>+                                <span aria-hidden=\"true\">Ã</span>\
>                             </button>\
>-                            <h4 class="modal-title">' + title + '</h4>\
>+                            <h4 class=\"modal-title\">" + title + "</h4>\
>                         </div>\
>-                        <div class="modal-body"><textarea id="code' + reportid + '">' + message + '</textarea>\
>+                        <div class=\"modal-body\"><textarea id=\"code" + reportid + "\">" + message + "</textarea>\
>                         </div>\
>-                        <div class="modal-footer">\
>-                            <a id="preview-modal-editreport" class="btn btn-default" href="/cgi-bin/koha/reports/guided_reports.pl?id=' + reportid + '&amp;op=edit_form"><i class="fa-solid fa-pencil" aria-hidden="true"></i> ' + _("Edit") + '</a>\
>-                            <a id="preview-modal-duplicate" class="btn btn-default" href="/cgi-bin/koha/reports/guided_reports.pl?op=duplicate&amp;id=' + reportid + '"><i class="fa fa-copy"></i> ' + _("Duplicate") + '</a>\
>-                            <a id="preview-modal-duplicate" class="btn btn-default" href="/cgi-bin/koha/tools/scheduler.pl?id=' + reportid + '"><i class="fa-solid fa-clock"></i> ' + _("Schedule") + '</a>\
>-                            <a class="btn btn-default submit-form-link" href="#" data-id="' + reportid + '" data-action="guided_reports.pl" data-method="post" data-op="cud-delete" data-confirmation-msg="' + _('Are you sure you want to delete this report?') + '"><i class="fa fa-trash-can"></i> Delete</a>\
>-                            <a id="preview-modal-runreport" class="btn btn-default" href="/cgi-bin/koha/reports/guided_reports.pl?id=' + reportid + '&amp;op=run"><i class="fa fa-play"></i> ' + _("Run report") + '</a>\
>-                            <a href="#" id="preview-sql-modal-cancel" data-dismiss="modal" class="btn btn-default"><i class="fa fa-times" aria-hidden="true"></i> ' + _("Close") + '</a>\
>+                        <div class=\"modal-footer\">\
>+                            <a id=\"preview-modal-editreport\" class=\"btn btn-default\" href=\"/cgi-bin/koha/reports/guided_reports.pl?id=" + reportid + "&amp;op=edit_form\"><i class=\"fa-solid fa-pencil\" aria-hidden=\"true\"></i> " + _("Edit") + "</a>\
>+                            <a id=\"preview-modal-duplicate\" class=\"btn btn-default\" href=\"/cgi-bin/koha/reports/guided_reports.pl?op=duplicate&amp;id=" + reportid + "\"><i class=\"fa fa-copy\"></i> " + _("Duplicate") + "</a>\
>+                            <a id=\"preview-modal-duplicate\" class=\"btn btn-default\" href=\"/cgi-bin/koha/tools/scheduler.pl?id=" + reportid + "\"><i class=\"fa-solid fa-clock\"></i> " + _("Schedule") + "</a>\
>+                            <a class=\"btn btn-default submit-form-link\" href=\"#\" data-id=\"" + reportid + "\" data-action=\"guided_reports.pl\" data-method=\"post\" data-op=\"cud-delete\" data-confirmation-msg=\"" + _("Are you sure you want to delete this report?") + "\"><i class=\"fa fa-trash-can\"></i> Delete</a>\
>+                            <a id=\"preview-modal-runreport\" class=\"btn btn-default\" href=\"/cgi-bin/koha/reports/guided_reports.pl?id=" + reportid + "&amp;op=run\"><i class=\"fa fa-play\"></i> " + _("Run report") + "</a>\
>+                            <a href=\"#\" id=\"preview-sql-modal-cancel\" data-dismiss=\"modal\" class=\"btn btn-default\"><i class=\"fa fa-times\" aria-hidden=\"true\"></i> " + _("Close") + "</a>\
>                         </div>\
>                     </div>\
>                 </div>\
>-            </div>');
>+            </div>");
> 
>             $("#preview-sql-modal").modal('show');
>             CodeMirror.fromTextArea( document.getElementById("code" + reportid ), {
>-- 
>2.39.2

Actions: View | Diff | Splinter Review

Attachments on bug 37270: 168653 | 168667 | 169091 | 169155