tonyair
/
silverstripe-reports
mirror of https://github.com/silverstripe/silverstripe-reports
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6 from mateusz/merge-back 

BUG Fix sorting on main ReportAdmin grid ref: CWPBUG-133
This commit is contained in:
Sean Harvey 2014-08-14 10:19:05 +12:00
parent 193a2ab31c 13565a5e90
commit 26d7728cd4
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
code/Report.php
View File

@ -80,6 +80,15 @@ class SS_Report extends ViewableData {
return $this->title;
}
/**
* Allows access to title as a property
*
* @return string
*/
public function getTitle() {
return $this->title();
}
/**
* Return the description of this report.
*

11
code/ReportAdmin.php
View File

@ -40,7 +40,9 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider {
parent::init();
//set the report we are currently viewing from the URL
$this->reportClass = (isset($this->urlParams['ReportClass'])) ? $this->urlParams['ReportClass'] : null;
$this->reportClass = (isset($this->urlParams['ReportClass']) && $this->urlParams['ReportClass'] !== 'index')
? $this->urlParams['ReportClass']
: null;
$allReports = SS_Report::get_reports();
$this->reportObject = (isset($allReports[$this->reportClass])) ? $allReports[$this->reportClass] : null;
@ -131,8 +133,11 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider {
* @return String
*/
public function Link($action = null) {
$link = parent::Link($action);
if ($this->reportObject) $link = $this->reportObject->getLink($action);
if ($this->reportObject) {
$link = $this->reportObject->getLink($action);
} else {
$link = self::join_links(parent::Link('index'), $action);
}
return $link;
}