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

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 508-513 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
508
('RentalsInNoissuesCharge','1',NULL,'Rental charges block checkouts (added to noissuescharge).','YesNo'),
508
('RentalsInNoissuesCharge','1',NULL,'Rental charges block checkouts (added to noissuescharge).','YesNo'),
509
('ReplyToDefault','',NULL,'Use this email address as the replyto in emails','Free'),
509
('ReplyToDefault','',NULL,'Use this email address as the replyto in emails','Free'),
510
('ReportsLog','0',NULL,'If ON, log information about reports.','YesNo'),
510
('ReportsLog','0',NULL,'If ON, log information about reports.','YesNo'),
511
('ReportsMaxRowsInChart','10000',NULL,'If greater than 0, sets the maximum number of rows that will be used when charting results of guided reports','Integer'),
511
('RequestOnOpac','1',NULL,'If ON, globally enables patron holds on OPAC','YesNo'),
512
('RequestOnOpac','1',NULL,'If ON, globally enables patron holds on OPAC','YesNo'),
512
('RequireStrongPassword','1','','Require a strong login password for staff and patrons','YesNo'),
513
('RequireStrongPassword','1','','Require a strong login password for staff and patrons','YesNo'),
513
('ReservesControlBranch','PatronLibrary','ItemHomeLibrary|PatronLibrary','Branch checked for members reservations rights','Choice'),
514
('ReservesControlBranch','PatronLibrary','ItemHomeLibrary|PatronLibrary','Branch checked for members reservations rights','Choice'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (+1 lines)
Lines 719-724 canned reports and writing custom SQL reports.</p> Link Here
719
<h1>[% name | html %]</h1>
719
<h1>[% name | html %]</h1>
720
[% IF ( notes ) %]<p><span class="label">Notes:</span> [% notes | html %]</p>[% END %]
720
[% IF ( notes ) %]<p><span class="label">Notes:</span> [% notes | html %]</p>[% END %]
721
[% IF ( unlimited_total ) %]<p><span class="label">Total number of results:</span> [% unlimited_total | html %][% IF unlimited_total > limit %] ([% limit | html %] shown)[% END %].</p>[% END %]
721
[% IF ( unlimited_total ) %]<p><span class="label">Total number of results:</span> [% unlimited_total | html %][% IF unlimited_total > limit %] ([% limit | html %] shown)[% END %].</p>[% END %]
722
[% IF ( allresults.size == max_rows_in_chart ) %]Data in chart have been limited to [% max_rows_in_chart | html %] rows.[% END %]
722
723
723
<div id="sql_output" style="display:none;">
724
<div id="sql_output" style="display:none;">
724
    <span class="label">Report SQL:</span>
725
    <span class="label">Report SQL:</span>
(-)a/reports/guided_reports.pl (-1 / +3 lines)
Lines 829-834 elsif ($phase eq 'Run this report'){ Link Here
829
            $template->param(header_types => $header_types);
829
            $template->param(header_types => $header_types);
830
            my ( $sth, $errors ) = execute_query( $sql, $offset, $limit, undef, $report_id );
830
            my ( $sth, $errors ) = execute_query( $sql, $offset, $limit, undef, $report_id );
831
            my ($sth2, $errors2) = execute_query($sql);
831
            my ($sth2, $errors2) = execute_query($sql);
832
            my $max_rows = C4::Context->preference('ReportsMaxRowsInChart');
832
            my $total = nb_rows($sql) || 0;
833
            my $total = nb_rows($sql) || 0;
833
            unless ($sth) {
834
            unless ($sth) {
834
                die "execute_query failed to return sth for report $report_id: $sql";
835
                die "execute_query failed to return sth for report $report_id: $sql";
Lines 842-847 elsif ($phase eq 'Run this report'){ Link Here
842
                while (my $row = $sth2->fetchrow_arrayref()) {
843
                while (my $row = $sth2->fetchrow_arrayref()) {
843
                    my @cells = map { +{ cell => $_ } } @$row;
844
                    my @cells = map { +{ cell => $_ } } @$row;
844
                    push @allrows, { cells => \@cells };
845
                    push @allrows, { cells => \@cells };
846
                    last if $max_rows && @allrows >= $max_rows;
845
                }
847
                }
846
            }
848
            }
847
849
Lines 857-862 elsif ($phase eq 'Run this report'){ Link Here
857
            $template->param(
859
            $template->param(
858
                'results' => \@rows,
860
                'results' => \@rows,
859
                'allresults' => \@allrows,
861
                'allresults' => \@allrows,
862
                'max_rows_in_chart' => $max_rows,
860
                'sql'     => $sql,
863
                'sql'     => $sql,
861
                original_sql => $original_sql,
864
                original_sql => $original_sql,
862
                'id'      => $report_id,
865
                'id'      => $report_id,
863
- 

Return to bug 23626