Merge pull request #1795 from bolt/bugfix/taxonomy-empty

Include taxonomy types if no taxonomies set
bolt · Sep 1, 2020 · eb4ed4c · eb4ed4c
2 parents 81a4500 + 90ac359
commit eb4ed4c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/public/theme/skeleton/partials/_sub_taxonomylinks.twig b/public/theme/skeleton/partials/_sub_taxonomylinks.twig
@@ -1,8 +1,8 @@
 {% for type, taxonomies in record|taxonomies %}
     <em>
-        {% if taxonomies|length < 2 %}
+        {% if taxonomies|length == 1 %}
             {{ config.get('taxonomies')[type].singular_name }}:
-        {% else %}
+        {% elseif taxonomies|length > 1 %}
             {{ config.get('taxonomies')[type].name }}:
         {% endif %}
     </em>

diff --git a/src/Twig/ContentExtension.php b/src/Twig/ContentExtension.php
@@ -429,6 +429,15 @@ private function generateLink(string $route, array $params, $canonical = false):
     public function getTaxonomies(Content $content): Collection
     {
         $taxonomies = [];
+
+        $definition = $content->getDefinition();
+
+        if ($definition && is_iterable($definition->get('taxonomy'))) {
+            foreach ($definition->get('taxonomy') as $taxonomy) {
+                $taxonomies[$taxonomy] = [];
+            }
+        }
+
         foreach ($content->getTaxonomies() as $taxonomy) {
             $taxonomies[$taxonomy->getType()][$taxonomy->getSlug()] = $taxonomy;
         }