Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #10043 -- widthratio tag now accepts a variable for the max_wid…

…th argument.

The max_width argument now passes through FilterExpression which by side-affect
allows float values, but will be truncated.

Thanks obeattie and Eric Holscher for patches.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10352 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 64e82fb648ebdd7c98fa5f1cffb1e21f1918cf4d 1 parent 624caac
@brosner brosner authored
View
13 django/template/defaulttags.py
@@ -402,12 +402,15 @@ def render(self, context):
try:
value = self.val_expr.resolve(context)
maxvalue = self.max_expr.resolve(context)
+ max_width = int(self.max_width.resolve(context))
except VariableDoesNotExist:
return ''
+ except ValueError:
+ raise TemplateSyntaxError("widthratio final argument must be an number")
try:
value = float(value)
maxvalue = float(maxvalue)
- ratio = (value / maxvalue) * int(self.max_width)
+ ratio = (value / maxvalue) * max_width
except (ValueError, ZeroDivisionError):
return ''
return str(int(round(ratio)))
@@ -1143,12 +1146,10 @@ def widthratio(parser, token):
if len(bits) != 4:
raise TemplateSyntaxError("widthratio takes three arguments")
tag, this_value_expr, max_value_expr, max_width = bits
- try:
- max_width = int(max_width)
- except ValueError:
- raise TemplateSyntaxError("widthratio final argument must be an integer")
+
return WidthRatioNode(parser.compile_filter(this_value_expr),
- parser.compile_filter(max_value_expr), max_width)
+ parser.compile_filter(max_value_expr),
+ parser.compile_filter(max_width))
widthratio = register.tag(widthratio)
#@register.tag
View
5 tests/regressiontests/templates/tests.py
@@ -923,7 +923,10 @@ def get_template_tests(self):
# Raise exception if we don't have 3 args, last one an integer
'widthratio08': ('{% widthratio %}', {}, template.TemplateSyntaxError),
'widthratio09': ('{% widthratio a b %}', {'a':50,'b':100}, template.TemplateSyntaxError),
- 'widthratio10': ('{% widthratio a b 100.0 %}', {'a':50,'b':100}, template.TemplateSyntaxError),
+ 'widthratio10': ('{% widthratio a b 100.0 %}', {'a':50,'b':100}, '50'),
+
+ # #10043: widthratio should allow max_width to be a variable
+ 'widthratio11': ('{% widthratio a b c %}', {'a':50,'b':100, 'c': 100}, '50'),
### WITH TAG ########################################################
'with01': ('{% with dict.key as key %}{{ key }}{% endwith %}', {'dict': {'key':50}}, '50'),
Please sign in to comment.
Something went wrong with that request. Please try again.