From afbca3a88fcce92ef9650ef9fc5c54cd15db56de Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Mon, 19 Nov 2007 01:21:44 +0000 Subject: [PATCH] parents-merge 33211 - Added getReportField & filter_onchange options to DataReports git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45045 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- forms/DataReport.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/forms/DataReport.php b/forms/DataReport.php index c41230eae..7908056cf 100755 --- a/forms/DataReport.php +++ b/forms/DataReport.php @@ -517,7 +517,8 @@ HTML } protected function getReportType() { - return 'DataReport'; + if(class_exists($this->name)) return $this->name; + else return $this->class; } /** @@ -568,7 +569,10 @@ class DataReport_Controller extends Controller{ $sord = array("Order.ID"=>"DESC"), $join = array("MemberID"=>array("table"=>"Member", "field"=>"ID")) ); - $orderReport->filter_onchange(); + + if($orderReport->hasMethod('getReportField')) $orderReport = $orderReport->getReportField(); + + if($orderReport->hasMethod('filter_onchange')) $orderReport->filter_onchange(); $orderReport->exportToCSV("report.csv"); } }