From 5a41ff6b1fa0ab89ea719264c902083377a2cac3 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 25 May 2010 23:57:38 +0000
Subject: [PATCH] ENHANCEMENT: Improved look and feel for report filtering
 ENHANCEMNT: Added export and print buttons to reports (from r95815) (from
 r98173)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@105686 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ReportAdmin.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php
index abb865a7..17da060c 100755
--- a/code/ReportAdmin.php
+++ b/code/ReportAdmin.php
@@ -123,8 +123,9 @@ class ReportAdmin extends LeftAndMain {
 	 */
 	public function EditForm($request = null) {
 		$className = Session::get('currentPage');
-		$requestId = $request ? $request->requestVar('ID') : null;
-		
+		$requestId = $this->getRequest()->requestVar('ID');
+		if(!$requestId) $requestId = $this->getRequest()->latestParam('ID');
+
 		if ( $requestId )
 			return $this->getEditForm($requestId);
 		
@@ -163,7 +164,7 @@ class ReportAdmin extends LeftAndMain {
 		$actions = $obj->getCMSActions();
 
 		$form = new Form($this, 'EditForm', $fields, $actions);
-		
+		$form->setTemplate('ReportAdminForm');
 		$form->loadDataFrom($this->request->requestVars());
 
 		return $form;