tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 11:05:53 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1017 from tractorcow/pulls/3.1/fix-report-sorting

Browse Source 
BUG Fix sorting on main ReportAdmin grid
This commit is contained in:
Sean Harvey 2014-08-13 10:52:51 +12:00
commit 796874dae7
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
code/controllers/ReportAdmin.php
View File

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

9
code/reports/Report.php
View File

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