BUGFIX: Fix not being able to print/export reports (from r98684)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99128 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-02-16 04:07:30 +00:00 committed by Sam Minnee
parent aea14859f9
commit b41c401223

View File

@ -116,7 +116,8 @@ class ReportAdmin extends LeftAndMain {
* @return Form
*/
public function EditForm() {
$id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : null;
// Return the report if the ID is sent by request, or we're specifically asking for the edit form
$id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : ($this->getRequest()->latestParam('Action') == 'EditForm') ? Session::get('currentReport') : null;
if($id) {
foreach($this->Reports() as $report) {
@ -132,7 +133,7 @@ class ReportAdmin extends LeftAndMain {
* @return SS_Report
*/
public function CurrentReport() {
$id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : null;
$id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : ($this->getRequest()->latestParam('Action') == 'EditForm') ? Session::get('currentReport') : null;
if($id) {
foreach($this->Reports() as $report) {