From 1e92bfa3864a8929c5a296ffb21dc27188a325c5 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Thu, 15 Mar 2007 03:26:40 +0000
Subject: [PATCH]  - fix: SQLReport SubQuery Pagination (William McKee /
 Knowmad Technologies)  - fix: SQL Report: Paginate After (Still) (William
 McKee / Knowmad    Technologies)

---
 docs/changelog/7.x.x.txt              | 4 ++++
 lib/WebGUI/Asset/Wobject/SQLReport.pm | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 37cf1b51a..1d8234913 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,5 +1,9 @@
 7.3.13
  - fix: Stale pages after user login
+ - fix: SQLReport SubQuery Pagination (William McKee / Knowmad Technologies)
+ - fix: SQL Report: Paginate After (Still) (William McKee / Knowmad
+   Technologies)
+
 
 7.3.12
  - Performance enhancement added to Page Layouts to make them do template
diff --git a/lib/WebGUI/Asset/Wobject/SQLReport.pm b/lib/WebGUI/Asset/Wobject/SQLReport.pm
index e40e51fa0..e3a4f850e 100644
--- a/lib/WebGUI/Asset/Wobject/SQLReport.pm
+++ b/lib/WebGUI/Asset/Wobject/SQLReport.pm
@@ -610,7 +610,8 @@ sub _processQuery {
                                 }
                         }
 			my $paginateAfter = ($page == 1) ? $self->get("paginateAfter") : 99999999;
-                        my $p = WebGUI::Paginator->new($self->session,$url,$paginateAfter);
+			my $paginatePage = ($nr > 1) ? 1 : $self->session->form->param('pn');
+                        my $p = WebGUI::Paginator->new($self->session,$url,$paginateAfter, undef, $paginatePage);
                         my $error = $p->setDataByQuery($query,$dbh,1,$placeholderParams);
                         if ($error ne "") {
                                 $self->session->errorHandler->warn("There was a problem with the query: ".$error);
@@ -621,7 +622,7 @@ sub _processQuery {
                                 my @columns;
                                 my @rows;
                                 my $rownum = 1;
-                                foreach my $data (@{$p->getPageData}) {
+                                foreach my $data (@{$p->getPageData($paginatePage)}) {
 					$self->{_query}{$nr}{rowData} = $data;
                                         my %row;
                                         my $colnum = 1;