Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.0.X] Fixed #11270 -- Corrected naming conflict in templatetag test…

…. Thanks to steveire for the report.

Merge of r11067 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11069 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit bb0538d4d5122272ab12469778f7cacc818f504f 1 parent 9356e16
@freakboy3742 freakboy3742 authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  tests/regressiontests/templates/tests.py
View
2  tests/regressiontests/templates/tests.py
@@ -611,7 +611,7 @@ def get_template_tests(self):
# 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'),
# Test the else clause of ifchanged.
'ifchanged-else01': ('{% for id in ids %}{{ id }}{% ifchanged id %}-first{% else %}-other{% endifchanged %},{% endfor %}', {'ids': [1,1,2,2,2,3]}, '1-first,1-other,2-first,2-other,2-other,3-first,'),
Please sign in to comment.
Something went wrong with that request. Please try again.