Merge 3.4 into 3

# Conflicts:
#	composer.json

code/Report.php

@@ -288,8 +288,20 @@ class SS_Report extends ViewableData {
 			if(isset($info['casting'])) $fieldCasting[$source] = $info['casting'];
 
 			if(isset($info['link']) && $info['link']) {
-				$link = singleton('CMSPageEditController')->Link('show');
+				$fieldFormatting[$source] = function($value, $item) {
-				$fieldFormatting[$source] = '<a href=\"' . $link . '/$ID\">$value</a>';
+					$title = Convert::raw2xml($value);
+
+					// If this item is previewable, decorate with link
+					if ($item instanceof CMSPreviewable) {
+						return sprintf(
+							'<a href="%s" title="%s">%s</a>',
+							$item->CMSEditLink(), $title, $title
+						);
+					}
+
+					// Fall back to basic title
+					return $title;
+				};
 			}
 
 			$displayFields[$source] = isset($info['title']) ? $info['title'] : $source;

tests/ReportTest.php

@@ -78,6 +78,42 @@ class ReportTest extends SapphireTest {
 		$this->logInWithPermission('ADMIN');
 		$this->assertTrue($report->canView());
 	}
+
+	public function testColumnLink() {
+		$report = new ReportTest_FakeTest();
+		/** @var GridField $gridField */
+		$gridField = $report->getReportField();
+		/** @var GridFieldDataColumns $columns */
+		$columns = $gridField->getConfig()->getComponentByType('GridFieldDataColumns');
+
+		$page = new ReportTest_FakeObject();
+		$page->Title = 'My Object';
+		$page->ID = 959547;
+
+		$titleContent = $columns->getColumnContent($gridField, $page, 'Title');
+		$this->assertEquals('<a href="dummy-edit-link/959547" title="My Object">My Object</a>', $titleContent);
+	}
+}
+
+class ReportTest_FakeObject extends DataObject implements CMSPreviewable, TestOnly {
+
+	private static $db = array(
+		'Title' => 'Varchar'
+	);
+
+	/**
+	 * @return String Absolute URL to the end-user view for this record.
+	 * Example: http://mysite.com/my-record
+	 */
+	public function Link()
+	{
+		return Controller::join_links('dummy-link', $this->ID);
+	}
+
+	public function CMSEditLink()
+	{
+		return Controller::join_links('dummy-edit-link', $this->ID);
+	}
 }
 
 /**
@@ -91,7 +127,8 @@ class ReportTest_FakeTest extends SS_Report implements TestOnly {
 	public function columns() {
 		return array(
 			"Title" => array(
-				"title" => "Page Title"
+				"title" => "Page Title",
+				"link" => true,
 			)
 		);
 	}