Changeset 6571

Timestamp:

10/20/07 10:01:31 (1 year ago)

Author:

mtredinnick

Message:

Fixed #4123 -- Changed the firstof template tag to correctly handle a literal
string as its last argument. Thanks, Wesley Fok and Matt Boersma.

Files:

• django/trunk/django/template/defaulttags.py (modified) (1 diff)
• django/trunk/docs/templates.txt (modified) (1 diff)
• django/trunk/tests/regressiontests/templates/tests.py (modified) (1 diff)

django/trunk/django/template/defaulttags.py

@@ -518 +518 @@
-
-    but obviously much cleaner!
-
-
+
+
+
+
+
+
+
+
-    if len(bits) < 1:
-        raise TemplateSyntaxError, "'firstof' statement requires at least one argument"

django/trunk/docs/templates.txt

@@ -476 +476 @@
-        {{ var3 }}
-    {% endif %}{% endif %}{% endif %}
+
+You can also use a literal string as a fallback value in case all
+passed variables are False::
+
+    {% firstof var1 var2 var3 "fallback value" %}
-
-for

django/trunk/tests/regressiontests/templates/tests.py

@@ -342 +342 @@
-            'firstof04': ('{% firstof a b c %}', {'a':0,'b':0,'c':3}, '3'),
-            'firstof05': ('{% firstof a b c %}', {'a':1,'b':2,'c':3}, '1'),
-
+
+
+
+
-
-            ### FOR TAG ###############################################################