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

BUG Make template lookup use 'type' correctly

Browse Source
This commit is contained in:
Damian Mooyman 2016-08-05 16:00:38 +12:00
parent 0fa39b591f
commit 7026da20db
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
3 changed files with 63 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
tests/core/manifest/ThemeResourceLoaderTest.php
View File

@ -75,6 +75,54 @@ class ThemeResourceLoaderTest extends SapphireTest {
); );
} }
public function testFindTemplateByType() {
// Test that "type" is respected properly
$this->assertEquals(
"{$this->base}/module/templates/MyNamespace/Layout/MyClass.ss",
$this->loader->findTemplate(
[
[
'type' => 'Layout',
'MyNamespace/NonExistantTemplate'
],
[
'type' => 'Layout',
'MyNamespace/MyClass'
],
'MyNamespace/MyClass'
],
[
'silverstripe/module:subtheme',
'theme',
'$default',
]
)
);
// Non-typed template can be found even if looking for typed theme at a lower priority
$this->assertEquals(
"{$this->base}/module/templates/MyNamespace/MyClass.ss",
$this->loader->findTemplate(
[
[
'type' => 'Layout',
'MyNamespace/NonExistantTemplate'
],
'MyNamespace/MyClass',
[
'type' => 'Layout',
'MyNamespace/MyClass'
]
],
[
'silverstripe/module',
'theme',
'$default',
]
)
);
}
/** /**
* Test that 'main' and 'Layout' templates are loaded from set theme * Test that 'main' and 'Layout' templates are loaded from set theme
*/ */

6
view/SSViewer.php
View File

@ -880,8 +880,8 @@ class SSViewer implements Flushable {
$template = $class . $suffix; $template = $class . $suffix;
if(SSViewer::hasTemplate($template)) { if(SSViewer::hasTemplate($template)) {
$templates[] = $template; $templates[] = $template;
} elseif(SSViewer::hasTemplate('Includes/'.$template)) { } elseif(SSViewer::hasTemplate($template = ['type' => 'Includes', $template])) {
$templates[] = 'Includes/'.$template; $templates[] = $template;
} }
// If the class is "Page_Controller", look for Page.ss // If the class is "Page_Controller", look for Page.ss
@ -1038,7 +1038,7 @@ class SSViewer implements Flushable {
* *
* @return string Full system path to a template file * @return string Full system path to a template file
*/ */
public static function getTemplateFileByType($identifier, $type) { public static function getTemplateFileByType($identifier, $type = null) {
return ThemeResourceLoader::instance()->findTemplate(['type' => $type, $identifier], self::get_themes()); return ThemeResourceLoader::instance()->findTemplate(['type' => $type, $identifier], self::get_themes());
} }

14
view/ThemeResourceLoader.php
View File

@ -132,7 +132,7 @@ class ThemeResourceLoader {
* @param string|array $template Template name, or template spec in array format with the keys * @param string|array $template Template name, or template spec in array format with the keys
* 'type' (type string) and 'templates' (template hierarchy in order of precedence). * 'type' (type string) and 'templates' (template hierarchy in order of precedence).
* If 'templates' is ommitted then any other item in the array will be treated as the template * If 'templates' is ommitted then any other item in the array will be treated as the template
* list. * list, or list of templates each in the array spec given.
* Templates with an .ss extension will be treated as file paths, and will bypass * Templates with an .ss extension will be treated as file paths, and will bypass
* theme-coupled resolution. * theme-coupled resolution.
* @param array $themes List of themes to use to resolve themes. In most cases * @param array $themes List of themes to use to resolve themes. In most cases
@ -158,11 +158,21 @@ class ThemeResourceLoader {
// If we have an .ss extension, this is a path, not a template name. We should // If we have an .ss extension, this is a path, not a template name. We should
// pass in templates without extensions in order for template manifest to find // pass in templates without extensions in order for template manifest to find
// files dynamically. // files dynamically.
if(count($templateList) == 1 && substr($templateList[0], -3) == '.ss') { if(count($templateList) == 1 && is_string($templateList[0]) && substr($templateList[0], -3) == '.ss') {
return $templateList[0]; return $templateList[0];
} }
foreach($templateList as $i => $template) { foreach($templateList as $i => $template) {
// Check if passed list of templates in array format
if (is_array($template)) {
$path = $this->findTemplate($template, $themes);
if ($path) {
return $path;
}
continue;
}
// Check string template identifier
$template = str_replace('\\', '/', $template); $template = str_replace('\\', '/', $template);
$parts = explode('/', $template); $parts = explode('/', $template);