Django

Code

Changeset 7688

Show
Ignore:
Timestamp:
06/18/08 07:59:39 (5 months ago)
Author:
russellm
Message:

Fixed #7318 -- Cleaned up the template inheritance logic, specifically to handle the case where the parent template has no template tags/blocks. Took the opportunity to optimize the logic a little. Thanks to Matthias Kestenholz <mk@spinlock.ch> for the original report and test case.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/template/loader_tags.py

    r7089 r7688  
    7070    def render(self, context): 
    7171        compiled_parent = self.get_parent(context) 
    72         pos = 0 
    73         while isinstance(compiled_parent.nodelist[pos], TextNode): 
    74             pos += 1 
    75         parent_is_child = isinstance(compiled_parent.nodelist[pos], ExtendsNode) 
    7672        parent_blocks = dict([(n.name, n) for n in compiled_parent.nodelist.get_nodes_by_type(BlockNode)]) 
    7773        for block_node in self.nodelist.get_nodes_by_type(BlockNode): 
    …… 
    8480                # add this BlockNode to the parent's ExtendsNode nodelist, so 
    8581                # it'll be checked when the parent node's render() is called. 
    86                 if parent_is_child: 
    87                     compiled_parent.nodelist[pos].nodelist.append(block_node) 
     82 
     83                # Find out if the parent template has a parent itself 
     84                for node in compiled_parent.nodelist: 
     85                    if not isinstance(node, TextNode): 
     86                        # If the first non-text node is an extends, handle it. 
     87                        if isinstance(node, ExtendsNode): 
     88                            node.nodelist.append(block_node) 
     89                        # Extends must be the first non-text node, so once you find 
     90                        # the first non-text node you can stop looking.  
     91                        break 
    8892            else: 
    8993                # Keep any existing parents and add a new one. Used by BlockNode. 

  • django/trunk/tests/regressiontests/templates/tests.py

    r7565 r7688  
    705705            'inheritance25': ("{% extends context_template.1 %}{% block first %}2{% endblock %}{% block second %}4{% endblock %}", {'context_template': [template.Template("Wrong"), template.Template("1{% block first %}_{% endblock %}3{% block second %}_{% endblock %}")]}, '1234'), 
    706706 
     707            # Set up a base template to extend 
     708                'inheritance26': ("no tags", {}, 'no tags'), 
     709 
     710                # Inheritance from a template that doesn't have any blocks 
     711                'inheritance27': ("{% extends 'inheritance26' %}", {}, 'no tags'), 
     712                 
    707713            ### I18N ################################################################## 
    708714