Ticket #11832: 11832.0.patch

django/template/__init__.py

@@ -173 +173 @@
             for subnode in node:
                 yield subnode
 
-    def render(self, context):
+    def render(self, context, block_name=None):
         "Display stage -- can be called many times"
         return self.nodelist.render(context)
 

django/template/loader_tags.py

@@ -1 +1 @@
 from django.template import TemplateSyntaxError, TemplateDoesNotExist, Variable
-from django.template import Library, Node, TextNode
+from django.template import Library, Node, TextNode, NodeList
 from django.template.loader import get_template, get_template_from_string, find_template_source
 from django.conf import settings
 from django.utils.safestring import mark_safe
@@ -96 +96 @@
                 parent_block.nodelist = block_node.nodelist
         return compiled_parent.render(context)
 
+def get_block_nodes(template, block_name):
+    for n in template.nodelist:
+        if isinstance(n, BlockNode) and n.name == block_name:
+            return n.nodelist
+    return NodeList()
+    
 class ConstantIncludeNode(Node):
-    def __init__(self, template_path):
+    def __init__(self, template_path, block_name=None):
         try:
+            self.block_name = block_name
             t = get_template(template_path)
             self.template = t
         except:
@@ -108 +115 @@
 
     def render(self, context):
         if self.template:
+            if self.block_name:
+                nodelist = get_block_nodes(self.template, self.block_name)
+                return nodelist.render(context)
             return self.template.render(context)
         else:
             return ''
 
 class IncludeNode(Node):
-    def __init__(self, template_name):
+    def __init__(self, template_name, block_name=None):
         self.template_name = Variable(template_name)
+        self.block_name = block_name
 
     def render(self, context):
         try:
             template_name = self.template_name.resolve(context)
             t = get_template(template_name)
+            if self.block_name:
+                nodelist = get_block_nodes(t, self.block_name)
+                return nodelist.render(context)
             return t.render(context)
         except TemplateSyntaxError, e:
             if settings.TEMPLATE_DEBUG:
@@ -156 +170 @@
     uses the literal value "base" as the name of the parent template to extend,
     or ``{% extends variable %}`` uses the value of ``variable`` as either the
     name of the parent template to extend (if it evaluates to a string) or as
-    the parent tempate itelf (if it evaluates to a Template object).
+    the parent tempate itself (if it evaluates to a Template object).
     """
     bits = token.split_contents()
     if len(bits) != 2:
@@ -177 +191 @@
 
     Example::
 
-        {% include "foo/some_include" %}
+        {% include "foo/some_include" ["block_name"] %}
     """
     bits = token.split_contents()
-    if len(bits) != 2:
-        raise TemplateSyntaxError, "%r tag takes one argument: the name of the template to be included" % bits[0]
+    if len(bits) < 2 or len(bits) > 3:
+        raise TemplateSyntaxError, "%r tag takes at least one argument: the name of the template to be included" % bits[0]
     path = bits[1]
+    if len(bits) == 3:
+        block = bits[2]
+        if path[0] in ('"', "'") and path[-1] == path[0]:
+            block = block[1:-1]
+        else:
+            # TODO: handle block name as variable
+            raise TemplateSyntaxError, "%r must be enclosed by quotes" % block
+    else:
+        block = None
     if path[0] in ('"', "'") and path[-1] == path[0]:
-        return ConstantIncludeNode(path[1:-1])
-    return IncludeNode(bits[1])
+        return ConstantIncludeNode(path[1:-1], block)
+    return IncludeNode(path, block)
 
 register.tag('block', do_block)
 register.tag('extends', do_extends)

tests/regressiontests/templates/tests.py

@@ -697 +697 @@
             'include04': ('a{% include "nonexistent" %}b', {}, "ab"),
             'include 05': ('template with a space', {}, 'template with a space'),
             'include06': ('{% include "include 05"%}', {}, 'template with a space'),
+            'included07': ('{% block head %}head here{% endblock %} body {% block tail %}tail here{% endblock %}', {}, 'head here body tail here'),
+            'include07-1': ('{% include "included07" "head" %}', {}, 'head here'),
+            'include07-2': ('{% include "included07" "tail" %}', {}, 'tail here'),
 
             ### NAMED ENDBLOCKS #######################################################