From a5331bfda19e046827e9cc27131af55f31fad426 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 24 May 2017 17:51:18 +0000 Subject: [PATCH] Bug 18667 - Show a diff view of SQL reports when converting This patch reformats the SQL conversion before-and-after view so that it shows a diff between the two, just as the Manage MARC Import interface does. This patch also makes a correction to the JavaScript which is triggered by the closing of the modal. In Bootstrap 3 "hidden.bs.modal" is the event name instead of "hidden." To test, apply the patch and find an SQL report in your reports library which requires updating. - Click the "Update SQL" button. - In the modal window, the "existing" and "updated" SQL should be shown side-by-side with colored highlighting of the differece. - Confirm that the "Update" button still works correctly. - Also confirm that if you open the preview of another report, the "Close" button hides the modal and updates the contents of the modal markup. Use your browser's DOM inspector to confirm that
contains only
and its contents. --- .../prog/en/modules/reports/convert_report.tt | 19 ++++++++++++------- .../prog/en/modules/reports/guided_reports_start.tt | 16 ++++++++++++++-- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/convert_report.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/convert_report.tt index de77876..c231eae 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/convert_report.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/convert_report.tt @@ -1,16 +1,21 @@ [% INCLUDE 'doc-head-open.inc' %] -Koha › Reports › Convert report + Koha › Reports › Convert report - -
+ +
[% IF msg == 'no_report' %] There is no valid report for this id. [% ELSIF msg == 'can_be_updated' %] -

Existing sql

- 
[% current_sql %]
-

Updated sql

- 
[% updated_sql %]
+
+

Existing SQL

+ [% current_sql | html_entity %] +
+ +
+

Updated SQL

+ [% updated_sql | html_entity %] +
[% ELSE %] Something went wrong. [% END %] 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 4ef3b0e..1e15f66 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 @@ -32,9 +32,15 @@ [% INCLUDE 'calendar.inc' %] [% IF ( saved1 ) %] + [% INCLUDE 'datatables.inc' %] [% END %] @@ -172,11 +178,17 @@ $("#delColumn").on("click",function(){ var ltitle = $(this).text(); var report_id = $(this).data("report_id"); var page = $(this).attr("href"); - $("#update_sql .modal-body").load(page + " div"); + $("#update_sql .modal-body").load(page + " div", function(){ + var diff1 = $("#col1 .show_sql").text(); + var diff2 = $("#col2 .show_sql").text(); + var diffs = diffString( escape(diff1), escape(diff2) ); + $("#col1 .show_sql,#col2 .show_sql").html(diffs); + }); $('#update_sql').modal('show'); $("#update_sql_button").attr("href", "/cgi-bin/koha/reports/guided_reports.pl?phase=Use saved&op=convert&report_id=" + report_id); }); - $("#update_sql").on("hidden", function(){ + + $("#update_sql").on("hidden.bs.modal", function(){ $("#update_sql_label").html(""); $("#update_sql .modal-body").html("
\"\" "+_("Loading")+"
"); }); -- 2.1.4