Fix issue if a listing page is fetched via setcontent

xiaohutai · Aug 21, 2018 · 96f1b68 · 96f1b68
1 parent 5634c9d
commit 96f1b68
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 27 deletions.
diff --git a/src/HierarchicalRoutesExtension.php b/src/HierarchicalRoutesExtension.php
@@ -29,7 +29,7 @@
  */
 class HierarchicalRoutesExtension extends SimpleExtension
 {
-    /** @var string $permission The permission a user needs for interaction with  the back-end */
+    /** @var string $permission The permission a user needs for interaction with the back-end */
     private $permission = 'extensions';
 
     /**

diff --git a/templates/tree.twig b/templates/tree.twig
@@ -3,35 +3,37 @@
 {% macro makeItem(item, children) %}
 
     {% setcontent record = item %}
-    {% set editlink = record.editlink() %}
 
-    {% set title %}
-        <code>[{{ record.contenttype.slug }}/{{ record.id }}]</code>
-        <i class="fa fa-fw fa-circle status-{{ record.status }}"></i>
-        <a href="{{ record.link() }}">{{ record.title }}</a>
-        {# <a class="btn btn-tertiary btn-xs" href="{{ record.link() }}">View</a> #}
+    {% if record is not iterable %}
+        {% set editlink = record.editlink() %}
+        {% set title %}
+            <code>[{{ record.contenttype.slug }}/{{ record.id }}]</code>
+            <i class="fa fa-fw fa-circle status-{{ record.status }}"></i>
+            <a href="{{ record.link() }}">{{ record.title }}</a>
+            {# <a class="btn btn-tertiary btn-xs" href="{{ record.link() }}">View</a> #}
 
-        {% if editlink %}
-            <a class="btn btn-tertiary btn-xs" href="{{ editlink }}">Edit</a>
-        {% endif %}
-    {% endset %}
+            {% if editlink %}
+                <a class="btn btn-tertiary btn-xs" href="{{ editlink }}">Edit</a>
+            {% endif %}
+        {% endset %}
 
-    <li>
-        {% if children is not empty %}
-            <details open>
-                <summary>
-                    {{ title }}
-                </summary>
-                <ol>
-                    {% for i, j in children %}
-                    {{ _self.makeItem(i, j) }}
-                    {% endfor %}
-                </ol>
-            </details>
-        {% else %}
-            {{ title }}
-        {% endif %}
-    </li>
+        <li>
+            {% if children is not empty %}
+                <details open>
+                    <summary>
+                        {{ title }}
+                    </summary>
+                    <ol>
+                        {% for i, j in children %}
+                        {{ _self.makeItem(i, j) }}
+                        {% endfor %}
+                    </ol>
+                </details>
+            {% else %}
+                {{ title }}
+            {% endif %}
+        </li>
+    {% endif %}
 
 {% endmacro %}