tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-02 14:18:26 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #941 from sminnee/fix-content-getviewer

Browse Source 
FIX: Fix failover to index template in ContentController::getViewer()
This commit is contained in:
Sam Minnée 2014-02-14 17:46:47 +13:00
commit 9674b2efb4
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/ContentController.php
View File

@ -404,6 +404,10 @@ HTML;
// Next, we need to add templates for all controllers
$templates += SSViewer::get_templates_by_class(get_class($this), $action, "Controller");
// Fail-over to the same for the "index" action
$templates += SSViewer::get_templates_by_class(get_class($this->dataRecord), "", "SiteTree");
$templates += SSViewer::get_templates_by_class(get_class($this), "", "Controller");
return new SSViewer($templates);
}

10
tests/controller/ContentControllerTest.php
View File

@ -161,6 +161,11 @@ class ContentControllerTest extends FunctionalTest {
$response = $this->get($page->RelativeLink("test"));
$this->assertEquals("ContentControllerTestPage_test", $response->getBody());
// Test that an action without a template will default to the index template, which is
// to say the default Page.ss template
$response = $this->get($page->RelativeLink("testwithouttemplate"));
$this->assertEquals("Foo", $response->getBody());
}
}
@ -190,5 +195,10 @@ class ContentControllerTestPage extends Page { }
class ContentControllerTestPage_Controller extends Page_Controller {
private static $allowed_actions = array(
"test",
"testwithouttemplate"
);
function testwithouttemplate() {
return array();
}
}