Ticket #6232: 6232.diff

django/template/defaulttags.py

@@ -163 +163 @@
     def __init__(self, nodelist, *varlist):
         self.nodelist = nodelist
         self._last_seen = None
-        self._varlist = map(Variable, varlist)
+        self._varlist = varlist
 
     def render(self, context):
         if 'forloop' in context and context['forloop']['first']:
@@ -805 +805 @@
     bits = token.contents.split()
     nodelist = parser.parse(('endifchanged',))
     parser.delete_first_token()
-    return IfChangedNode(nodelist, *bits[1:])
+    varlist = [parser.compile_filter(bit) for bit in bits[1:]]
+    return IfChangedNode(nodelist, *varlist)
 ifchanged = register.tag(ifchanged)
 
 #@register.tag

tests/regressiontests/templates/tests.py

@@ -552 +552 @@
             # Test a date+hour like construct, where the hour of the last day
             # is the same but the date had changed, so print the hour anyway.
             'ifchanged-param04': ('{% for d in days %}{% ifchanged %}{{ d.day }}{% endifchanged %}{% for h in d.hours %}{% ifchanged d h %}{{ h }}{% endifchanged %}{% endfor %}{% endfor %}', {'days':[{'day':1, 'hours':[1,2,3]},{'day':2, 'hours':[3]},] }, '112323'),
-
             # Logically the same as above, just written with explicit
             # ifchanged for the day.
-            'ifchanged-param04': ('{% for d in days %}{% ifchanged d.day %}{{ d.day }}{% endifchanged %}{% for h in d.hours %}{% ifchanged d.day h %}{{ h }}{% endifchanged %}{% endfor %}{% endfor %}', {'days':[{'day':1, 'hours':[1,2,3]},{'day':2, 'hours':[3]},] }, '112323'),
+            'ifchanged-param05': ('{% for d in days %}{% ifchanged d.day %}{{ d.day }}{% endifchanged %}{% for h in d.hours %}{% ifchanged d.day h %}{{ h }}{% endifchanged %}{% endfor %}{% endfor %}', {'days':[{'day':1, 'hours':[1,2,3]},{'day':2, 'hours':[3]},] }, '112323'),
 
+            # Variables passed to ifchanged can have filters.
+            'ifchanged-param06': ('{% for f in floats %}{% ifchanged f|floatformat:2 %}{{ f }}--{% endifchanged %}{% endfor %}', {'floats': [1.1, 1.1, 1.3, 1.305, 1.4] }, '1.1--1.3--1.4--'),
+
             ### IFEQUAL TAG ###########################################################
             'ifequal01': ("{% ifequal a b %}yes{% endifequal %}", {"a": 1, "b": 2}, ""),
             'ifequal02': ("{% ifequal a b %}yes{% endifequal %}", {"a": 1, "b": 1}, "yes"),