Merge pull request #6 from mateusz/merge-back

BUG Fix sorting on main ReportAdmin grid ref: CWPBUG-133
silverstripe · Aug 13, 2014 · 26d7728 · 26d7728
2 parents 193a2ab + 13565a5
commit 26d7728
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/code/Report.php b/code/Report.php
@@ -80,6 +80,15 @@ public function 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.
 	 * 

diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php
@@ -40,7 +40,9 @@ public function init() {
 		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 @@ public function Breadcrumbs($unlinked = false) {
 	 * @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;
 	}