From 021e03d8f076f7a6c336ab09d9697510e9e6b5a9 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 15 Aug 2023 08:38:20 +0000 Subject: [PATCH] Bug 34533: jsdiff library missing from guided reports page This patch restores the inclusion of the jsdiff JS library on the guided reports page when displaying saved SQL reports. This fixes a JS error in the browser console when the user tries to use our automatic update on SQL reports which use an older syntax. The patch also corrects a problem with svc/convert_report which was causing an error when trying to display the diff information. To test, apply the patch and restart services. - Go to Reports -> Create from SQL. - Add a report which is based on an older db structure. The example I found was: SELECT biblionumber, ExtractValue(marcxml,'//datafield/@tag/text()[substring(.,1,1) = "5"]') as 'notes' FROM biblioitems HAVING notes <> '' - Save the report and go to the list of saved reports. There should be an "Update" column in the table, with a message about your newly-added report: "This report seems obsolete, it uses biblioitems.marcxml field." - Clicking the "Update SQL" button should trigger a modal window that shows the before an after versions of the report. There should be no error in the browser console. Unfortunately the diff will not display because of a separate bug in svc/convert_report Signed.off-by: Jessie Zairo Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit f2be2cedc5e721e715a98b18299c55a0fdfa61d1) Signed-off-by: Fridolin Somers (cherry picked from commit 13bc2848a1104003e423cad230a741a03ebcf2da) Signed-off-by: Matt Blenkinsop --- .../prog/en/modules/reports/guided_reports_start.tt | 1 + svc/convert_report | 4 ++-- 2 files changed, 3 insertions(+), 2 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 21367317cd..b73c04e2b7 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 @@ -1471,6 +1471,7 @@ [% INCLUDE 'datatables.inc' %] [% IF ( saved1 ) %] [% INCLUDE 'columns_settings.inc' %] + [% Asset.js( "lib/jsdiff/jsdiff.min.js" ) | $raw %] [% END %] [% Asset.js( "lib/codemirror/codemirror.min.js" ) | $raw %] [% Asset.js( "lib/codemirror/overlay.min.js" ) | $raw %] diff --git a/svc/convert_report b/svc/convert_report index 36c8b9948b..b2779212d4 100755 --- a/svc/convert_report +++ b/svc/convert_report @@ -19,10 +19,10 @@ use Modern::Perl; -use C4::Auth; use C4::Reports::Guided; use Koha::Reports; -use C4::Output; +use C4::Auth qw( get_template_and_user get_session ); +use C4::Output qw( output_html_with_http_headers ); use CGI qw ( -utf8 ); my $query = CGI->new(); -- 2.39.5