From 3ab139e6ccff13340c9d3b2496d505f1563c27a8 Mon Sep 17 00:00:00 2001 From: Doug Bell Date: Thu, 2 Nov 2006 18:08:39 +0000 Subject: [PATCH] fix: SQLReport no longer paginates or runs nested queries when downloading.Stow's warning when cache is disabled is now a debug message, since that's what debug messages are for. --- docs/changelog/7.x.x.txt | 2 ++ lib/WebGUI/Asset/Wobject/SQLReport.pm | 6 ++++-- lib/WebGUI/Session/Stow.pm | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index aaadef17b..95d6f2d32 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -19,6 +19,8 @@ 7.1.4 - Template variables in the main Survey Template were out of date in the documentation. + - fix: SQLReport no longer paginates or runs nested queries when downloading. + - Made Stow's warning a debug message, which is what debug messages are for. 7.1.3 - fix: SQLReport now returns error if can't find DatabaseLink diff --git a/lib/WebGUI/Asset/Wobject/SQLReport.pm b/lib/WebGUI/Asset/Wobject/SQLReport.pm index 593989a12..5b9092e67 100644 --- a/lib/WebGUI/Asset/Wobject/SQLReport.pm +++ b/lib/WebGUI/Asset/Wobject/SQLReport.pm @@ -543,8 +543,10 @@ sub _parsePlaceholderParams { # be passed to processTemplate() sub _processQuery { my $self = shift; - my $nest = shift || 1; - my $page = shift || 1; + my $nest = shift; + $nest = 1 unless defined $nest; + my $page = shift; + $page = 1 unless defined $page; my $nr = shift || 1; my ($query, %var, $prefix); diff --git a/lib/WebGUI/Session/Stow.pm b/lib/WebGUI/Session/Stow.pm index 91a04a1b6..a100b336a 100644 --- a/lib/WebGUI/Session/Stow.pm +++ b/lib/WebGUI/Session/Stow.pm @@ -163,7 +163,7 @@ The value of the stow variable. Any scalar or reference. sub set { my $self = shift; - $self->session->errorHandler->warn('Stow->set() is being called but cache has been disabled') + $self->session->errorHandler->debug('Stow->set() is being called but cache has been disabled') if $self->session->config->get("disableCache"); my $name = shift; my $value = shift;