Use correct template directory in templateselect

bolt · Nov 17, 2020 · 4d63576 · 4d63576
1 parent 7c97529
commit 4d63576
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/Configuration/Parser/ThemeParser.php b/src/Configuration/Parser/ThemeParser.php
@@ -25,6 +25,11 @@ public function parse(): Collection
     {
         $theme = $this->parseConfigYaml($this->path . '/theme.yaml', true);
 
+        if (! isset($theme['template_directory'])) {
+            // the theme itself
+            $theme['template_directory'] = './';
+        }
+
         return new Collection($theme);
     }
 }
diff --git a/src/Twig/ContentExtension.php b/src/Twig/ContentExtension.php
@@ -488,9 +488,12 @@ public function getListTemplates(TemplateselectField $field): Collection
         $current = current($field->getValue());
 
         $finder = new Finder();
+        $templatesDir = $this->config->get('theme/template_directory');
+        $templatesPath = $this->config->getPath('theme', true, $templatesDir);
+
         $finder
             ->files()
-            ->in($this->config->getPath('theme'))
+            ->in($templatesPath)
             ->name($definition->get('filter', '/^[^_].*\.twig$/'))
             ->path($definition->get('path'));