mirror of
https://github.com/django/django.git
synced 2024-12-22 17:16:24 +00:00
Fixed #2208 -- Allow empty arguments to be passed to filters. Thanks, mattmcc.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3852 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
a27f12f388
commit
9c0568e21e
2
AUTHORS
2
AUTHORS
@ -104,7 +104,9 @@ answer newbie questions, and generally made Django that much better:
|
|||||||
Eugene Lazutkin <http://lazutkin.com/blog/>
|
Eugene Lazutkin <http://lazutkin.com/blog/>
|
||||||
Jeong-Min Lee
|
Jeong-Min Lee
|
||||||
Christopher Lenz <http://www.cmlenz.net/>
|
Christopher Lenz <http://www.cmlenz.net/>
|
||||||
|
lerouxb@gmail.com
|
||||||
limodou
|
limodou
|
||||||
|
mattmcc
|
||||||
Martin Maney <http://www.chipy.org/Martin_Maney>
|
Martin Maney <http://www.chipy.org/Martin_Maney>
|
||||||
Manuzhai
|
Manuzhai
|
||||||
Petar Marić
|
Petar Marić
|
||||||
|
@ -532,7 +532,7 @@ class FilterExpression(object):
|
|||||||
constant_arg, i18n_arg, var_arg = match.group("constant_arg", "i18n_arg", "var_arg")
|
constant_arg, i18n_arg, var_arg = match.group("constant_arg", "i18n_arg", "var_arg")
|
||||||
if i18n_arg:
|
if i18n_arg:
|
||||||
args.append((False, _(i18n_arg.replace(r'\"', '"'))))
|
args.append((False, _(i18n_arg.replace(r'\"', '"'))))
|
||||||
elif constant_arg:
|
elif constant_arg is not None:
|
||||||
args.append((False, constant_arg.replace(r'\"', '"')))
|
args.append((False, constant_arg.replace(r'\"', '"')))
|
||||||
elif var_arg:
|
elif var_arg:
|
||||||
args.append((True, var_arg))
|
args.append((True, var_arg))
|
||||||
|
@ -170,6 +170,9 @@ class Templates(unittest.TestCase):
|
|||||||
# Escaped backslash using known escape char
|
# Escaped backslash using known escape char
|
||||||
'basic-syntax35': (r'{{ var|default_if_none:"foo\now" }}', {"var": None}, r'foo\now'),
|
'basic-syntax35': (r'{{ var|default_if_none:"foo\now" }}', {"var": None}, r'foo\now'),
|
||||||
|
|
||||||
|
# Empty strings can be passed as arguments to filters
|
||||||
|
'basic-syntax36': (r'{{ var|join:"" }}', {'var': ['a', 'b', 'c']}, 'abc'),
|
||||||
|
|
||||||
### COMMENT TAG ###########################################################
|
### COMMENT TAG ###########################################################
|
||||||
'comment-tag01': ("{% comment %}this is hidden{% endcomment %}hello", {}, "hello"),
|
'comment-tag01': ("{% comment %}this is hidden{% endcomment %}hello", {}, "hello"),
|
||||||
'comment-tag02': ("{% comment %}this is hidden{% endcomment %}hello{% comment %}foo{% endcomment %}", {}, "hello"),
|
'comment-tag02': ("{% comment %}this is hidden{% endcomment %}hello{% comment %}foo{% endcomment %}", {}, "hello"),
|
||||||
|
Loading…
Reference in New Issue
Block a user