Changeset 3800

Timestamp:

09/23/06 04:49:58 (2 years ago)

Author:

mtredinnick

Message:

Fixed #2454 -- Make "ifchanged" tag work more predictably inside nested
for-loops. Thanks, dummy@habmalnefrage.de.

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/template/defaulttags.py (modified) (1 diff)
• django/trunk/tests/regressiontests/templates/tests.py (modified) (1 diff)

django/trunk/AUTHORS

@@ -70 +70 @@
-    dne@mayonnaise.net
-    Maximillian Dornseif <md@hudora.de>
+    dummy@habmalnefrage.de
-    Jeremy Dunck <http://dunck.us/>
-    Andy Dustman <farcepest@gmail.com>

django/trunk/django/template/defaulttags.py

@@ -130 +130 @@
-
-    def render(self, context):
+        if context.has_key('forloop') and context['forloop']['first']:
+            self._last_seen = None
-        content = self.nodelist.render(context)
-        if content != self._last_seen:

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

@@ -306 +306 @@
-            'ifchanged02': ('{% for n in num %}{% ifchanged %}{{ n }}{% endifchanged %}{% endfor %}', { 'num': (1,1,3) }, '13'),
-            'ifchanged03': ('{% for n in num %}{% ifchanged %}{{ n }}{% endifchanged %}{% endfor %}', { 'num': (1,1,1) }, '1'),
+            'ifchanged04': ('{% for n in num %}{% ifchanged %}{{ n }}{% endifchanged %}{% for x in numx %}{% ifchanged %}{{ x }}{% endifchanged %}{% endfor %}{% endfor %}', { 'num': (1, 2, 3), 'numx': (2, 2, 2)}, '122232'),
+            'ifchanged05': ('{% for n in num %}{% ifchanged %}{{ n }}{% endifchanged %}{% for x in numx %}{% ifchanged %}{{ x }}{% endifchanged %}{% endfor %}{% endfor %}', { 'num': (1, 1, 1), 'numx': (1, 2, 3)}, '1123123123'),
+            'ifchanged06': ('{% for n in num %}{% ifchanged %}{{ n }}{% endifchanged %}{% for x in numx %}{% ifchanged %}{{ x }}{% endifchanged %}{% endfor %}{% endfor %}', { 'num': (1, 1, 1), 'numx': (2, 2, 2)}, '1222'),
+            'ifchanged07': ('{% for n in num %}{% ifchanged %}{{ n }}{% endifchanged %}{% for x in numx %}{% ifchanged %}{{ x }}{% endifchanged %}{% for y in numy %}{% ifchanged %}{{ y }}{% endifchanged %}{% endfor %}{% endfor %}{% endfor %}', { 'num': (1, 1, 1), 'numx': (2, 2, 2), 'numy': (3, 3, 3)}, '1233323332333'),
-
-            ### IFEQUAL TAG ###########################################################