Changeset 5815

Timestamp:

08/06/07 00:28:45 (1 year ago)

Author:

adrian

Message:

Fixed #5006 -- Fixed incorrect/outdated docstring for the 'if' template tag. Thanks, Thomas Petazzoni

Files:

• django/trunk/django/template/defaulttags.py (modified) (2 diffs)

django/trunk/django/template/defaulttags.py

@@ -650 +650 @@
-    will be displayed if the test fails.
-
- or ``not`` to test a number of variables or to
-
+, ``and`` or ``not`` to test a number of
+variables or to 
-
-        {% if not athlete_list %}
@@ -661 +661 @@
-        {% endif %}
-
+        {% if athlete_list and coach_list %}
+            Both atheletes and coaches are available.
+        {% endif %}
+
-        {% if not athlete_list or coach_list %}
-            There are no athletes, or there are some coaches.
-        {% endif %}
-
-
-
-
-
-
-
-
-
+
+
-        {% endif %}
+
+    ``if`` tags do not allow ``and`` and ``or`` clauses with the same
+    tag, because the order of logic would be ambigous. For example,
+    this is invalid::
+
+    {% if athlete_list and coach_list or cheerleader_list %}
+
+    If you need to combine and and or to do advanced logic, just use
+    nested if tags. For example:
+
+    {% if athlete_list %}
+        {% if coach_list or cheerleader_list %}
+            We have athletes, and either coaches or cheerleaders!
+        {% endif %}
+    {% endif %}
-    """
-    bits = token.contents.split()