Fix includes that use a block fragment

Author: medihack

src/block_fragments/template.py

@@ -22,6 +22,8 @@ def __init__(self, template, block_name):
         self.source = template.source
 
     def render(self, context):
+        "Display stage -- can be called many times"
+
         # Make a copy of the context and reset the rendering state.
         # Trying to re-use a RenderContext in multiple renders can
         # lead to TemplateNotFound errors, as Django will skip past
@@ -30,16 +32,20 @@ def render(self, context):
         context_instance = copy(context)
         context_instance.render_context = RenderContext()
 
-        # Bind the template to the context.
-        with context_instance.render_context.push_state(self.template):
-            with context_instance.bind_template(self.template):
-                context.template_name = self.name
+        with context_instance.render_context.push_state(self):
+            if context_instance.template is None:
+                with context_instance.bind_template(self):
+                    context.template_name = self.name
+                    return self._render(context_instance)
+            else:
+                return self._render(context_instance)
 
-                # Before trying to render the template, we need to traverse the tree of
-                # parent templates and find all blocks in them.
-                self._build_block_context(self.template, context_instance)
+    def _render(self, context):
+        # Before trying to render the template, we need to traverse the tree of
+        # parent templates and find all blocks in them.
+        self._build_block_context(self.template, context)
 
-                return self._render_template_block(context_instance)
+        return self._render_template_block(context)
 
     def _build_block_context(self, template: Template, context: Context) -> None:
         """

tests/templates/test7.html

@@ -0,0 +1 @@
+{% include "test1.html#block2" %}

tests/templates/test8.html

@@ -0,0 +1,2 @@
+{% include "test1.html#block1" %}
+{% include "test4.html#block1" %}

tests/templates/test9.html

@@ -0,0 +1,4 @@
+{% block block1 %}
+{% include "test1.html#block2" %}
+block1 from test9
+{% endblock %}

tests/tests.py

@@ -165,8 +165,26 @@ def test_context_autoescape_off(engine):
     template.backend.engine.autoescape = autoescape
 
 
-def test_request_context(engine, settings, rf):
+def test_request_context(engine, rf):
     """Test that a request context data are properly rendered in a template."""
     request = rf.get("/dummy-url")
     template = engine.get_template("test_request_context.html#block1")
     assert template.render({"request": request}) == "/dummy-url"
+
+
+def test_include_fragment(engine):
+    """Test that an include tag works with block fragments."""
+    template = engine.get_template("test7.html")
+    assert template.render() == "block2 from test1"
+
+
+def test_multiple_include_fragment(engine):
+    """Test multiple include tags that use block fragments."""
+    template = engine.get_template("test8.html")
+    assert template.render() == "block1 from test1\nblock1 from test2\n"
+
+
+def test_include_fragment_in_block(engine):
+    """Test a block that does include a fragment."""
+    template = engine.get_template("test9.html#block1")
+    assert template.render() == "\nblock2 from test1\nblock1 from test9\n"