View | Details | Raw Unified | Return to bug 37508
Collapse All | Expand All

(-)a/C4/Reports/Guided.pm (+6 lines)
Lines 622-627 sub execute_query { Link Here
622
    Koha::Logger->get( { prefix => 0, interface => 'reports', category => 'execute.time.end' } )
622
    Koha::Logger->get( { prefix => 0, interface => 'reports', category => 'execute.time.end' } )
623
        ->info("Report finished: $report_id") if $report_id;
623
        ->info("Report finished: $report_id") if $report_id;
624
624
625
    foreach my $header ( @{ $sth->{NAME} } ) {
626
        if ( $header eq 'password' ) {
627
            return ( $sth, { passworderr => $header } );
628
        }
629
    }
630
625
    return ( $sth, { queryerr => $sth->errstr } ) if ( $sth->err );
631
    return ( $sth, { queryerr => $sth->errstr } ) if ( $sth->err );
626
    return ($sth);
632
    return ($sth);
627
}
633
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-1 / +4 lines)
Lines 1436-1441 Link Here
1436
                                    [% error.queryerr | html %]<br />Please check the log for further details.
1436
                                    [% error.queryerr | html %]<br />Please check the log for further details.
1437
                                [% ELSIF ( error.cache_expiry ) %]
1437
                                [% ELSIF ( error.cache_expiry ) %]
1438
                                    Please select a cache expiry less than 30 days.
1438
                                    Please select a cache expiry less than 30 days.
1439
                                [% ELSIF ( error.passworderr ) %]
1440
                                    The column selection in this report includes a password field.<br>
1441
                                    The report cannot be executed due to security risks.<br>
1442
                                    Please edit this report and ensure no password columns have been selected.
1439
                                [% ELSE %]
1443
                                [% ELSE %]
1440
                                [% END %]
1444
                                [% END %]
1441
                                <div id="onerror_actions">
1445
                                <div id="onerror_actions">
1442
- 

Return to bug 37508