Fixed #11270 -- Corrected naming conflict in templatetag test. Thanks to steveire for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11067 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
b836ed4666
commit
8950a40cec
|
@ -69,7 +69,7 @@ class SomeException(Exception):
|
||||||
|
|
||||||
class SomeOtherException(Exception):
|
class SomeOtherException(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
class ContextStackException(Exception):
|
class ContextStackException(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
@ -629,7 +629,7 @@ class Templates(unittest.TestCase):
|
||||||
|
|
||||||
# Logically the same as above, just written with explicit
|
# Logically the same as above, just written with explicit
|
||||||
# ifchanged for the day.
|
# 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.
|
# 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,'),
|
'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,'),
|
||||||
|
|
Loading…
Reference in New Issue