Changeset 4489

Timestamp:

02/11/07 18:22:22 (2 years ago)

Author:

mtredinnick

Message:

Fixed #3351 -- Added optional naming of the block in "endblock" tags to ensure
correct nesting. Thanks for the patch, SmileyChris?.

Files:

• django/trunk/django/template/loader_tags.py (modified) (1 diff)
• django/trunk/docs/templates.txt (modified) (1 diff)
• django/trunk/tests/regressiontests/templates/tests.py (modified) (1 diff)

django/trunk/django/template/loader_tags.py

@@ -130 +130 @@
-    except AttributeError: # parser.__loaded_blocks isn't a list yet
-        parser.__loaded_blocks = [block_name]
-
+'endblock %s' % block_name
-    parser.delete_first_token()
-    return BlockNode(block_name, nodelist)

django/trunk/docs/templates.txt

@@ -253 +253 @@
-      if you want to add to the contents of a parent block instead of
-      completely overriding it.
+
+    * You can optionally name your ``{{ endblock }}`` tag with the same name
+      you gave the ``{{ block }}`` tag (for example, ``{{ endblock content }}``).
+      In larger templates this helps you see which ``{{ block }}`` tags are
+      being closed.
-
-Finally, note that you can't define multiple ``{% block %}`` tags with the same

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

@@ -390 +390 @@
-            'include03': ('{% include template_name %}', {'template_name': 'basic-syntax02', 'headline': 'Included'}, "Included"),
-            'include04': ('a{% include "nonexistent" %}b', {}, "ab"),
+
+            ### NAMED ENDBLOCKS #######################################################
+
+            # Basic test
+            'namedendblocks01': ("1{% block first %}_{% block second %}2{% endblock second %}_{% endblock first %}3", {}, '1_2_3'),
+
+            # Unbalanced blocks
+            'namedendblocks02': ("1{% block first %}_{% block second %}2{% endblock first %}_{% endblock %}3", {}, template.TemplateSyntaxError),
+            'namedendblocks03': ("1{% block first %}_{% block second %}2{% endblock %}_{% endblock second %}3", {}, template.TemplateSyntaxError),
+            'namedendblocks04': ("1{% block first %}_{% block second %}2{% endblock second %}_{% endblock third %}3", {}, template.TemplateSyntaxError),
+            'namedendblocks05': ("1{% block first %}_{% block second %}2{% endblock first %}", {}, template.TemplateSyntaxError),
+
+            # Mixed named and unnamed endblocks
+            'namedendblocks06': ("1{% block first %}_{% block second %}2{% endblock %}_{% endblock first %}3", {}, '1_2_3'),
+            'namedendblocks07': ("1{% block first %}_{% block second %}2{% endblock second %}_{% endblock %}3", {}, '1_2_3'),
-
-            ### INHERITANCE ###########################################################