Owen Leonard
f2be2cedc5
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 <jzairo@bywatersolutions.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
53 lines
1.6 KiB
Perl
Executable file
53 lines
1.6 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# This file is part of Koha.
|
|
#
|
|
# Copyright 2017 Koha Development Team
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
use Modern::Perl;
|
|
|
|
use C4::Reports::Guided;
|
|
use Koha::Reports;
|
|
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();
|
|
my $report_id = $query->param('report_id');
|
|
|
|
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "reports/convert_report.tt",
|
|
query => $query,
|
|
type => "intranet",
|
|
flagsrequired => { reports => 'execute_reports' },
|
|
}
|
|
);
|
|
|
|
my $report = Koha::Reports->find( $report_id );
|
|
|
|
my $params;
|
|
if ( $report ) {
|
|
my $sql = $report->savedsql;
|
|
my $updated_sql = C4::Reports::Guided::convert_sql( $sql );
|
|
$params = { msg => 'can_be_updated', updated_sql => $updated_sql, current_sql => $sql };
|
|
} else {
|
|
$params = { msg => 'no_report' };
|
|
}
|
|
|
|
$template->param( %$params );
|
|
|
|
output_html_with_http_headers $query, $cookie, $template->output;
|