Fix content list rendering (#379)

chiefonboarding · Oct 18, 2023 · 73268d4 · 73268d4
1 parent ddbdcc7
commit 73268d4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/back/new_hire/templates/_content.html b/back/new_hire/templates/_content.html
@@ -15,22 +15,7 @@
     <blockquote>{{ block.data.text|safe|personalize:user}}</blockquote>
   {% endif %}
   {% if block.type == 'list' %}
-    {% if block.data.style == 'ordered' %}
-      <ol>
-    {% endif %}
-    {% if block.data.style == 'unordered' %}
-      <ul>
-    {% endif %}
-    {% for item in block.data.items %}
-      <li>{{item.content|safe|personalize:user}}</li>
-    {% endfor %}
-    {% if block.data.style == 'unordered' %}
-      </ul>
-    {% endif %}
-    {% if block.data.style == 'ordered' %}
-      </ol>
-    {% endif %}
-    <blockquote>{{ block.data.text|safe|personalize:user }}</blockquote>
+    {% include "_render_list.html" with items=block.data.items blockstyle=block.data.style %}
   {% endif %}
   {% if block.type == 'embed' %}
     {% if 'youtube' in block.data.embed  %}

diff --git a/back/new_hire/templates/_render_list.html b/back/new_hire/templates/_render_list.html
@@ -0,0 +1,17 @@
+{% load general %}
+{% if blockstyle == 'ordered' and items %}
+  <ol>
+{% endif %}
+{% if blockstyle == 'unordered' and items %}
+  <ul>
+{% endif %}
+{% for item in items %}
+  <li>{{item.content|safe|personalize:user}}</li>
+  {% include "_render_list.html" with items=item.items %}
+{% endfor %}
+{% if blockstyle == 'unordered' and items %}
+  </ul>
+{% endif %}
+{% if blockstyle == 'ordered' and items %}
+  </ol>
+{% endif %}