Fixed #2026 -- Added support for 'and' in template 'if' tags, added dozens of unit tests and updated docs. Thanks, ckknight

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3108 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 38 insertions, 12 deletions

diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py
index 18f1b9ab30..364a4608eb 100644
--- a/django/template/defaulttags.py
+++ b/django/template/defaulttags.py
@@ -149,9 +149,10 @@ class IfEqualNode(Node):
         return self.nodelist_false.render(context)
 
 class IfNode(Node):
-    def __init__(self, bool_exprs, nodelist_true, nodelist_false):
+    def __init__(self, bool_exprs, nodelist_true, nodelist_false, link_type):
         self.bool_exprs = bool_exprs
         self.nodelist_true, self.nodelist_false = nodelist_true, nodelist_false
+        self.link_type = link_type
 
     def __repr__(self):
         return "<If node>"
@@ -171,14 +172,28 @@ class IfNode(Node):
         return nodes
 
     def render(self, context):
-        for ifnot, bool_expr in self.bool_exprs:
-            try:
-                value = bool_expr.resolve(context)
-            except VariableDoesNotExist:
-                value = None
-            if (value and not ifnot) or (ifnot and not value):
-                return self.nodelist_true.render(context)
-        return self.nodelist_false.render(context)
+        if self.link_type == IfNode.LinkTypes.or_:
+            for ifnot, bool_expr in self.bool_exprs:
+                try:
+                    value = bool_expr.resolve(context)
+                except VariableDoesNotExist:
+                    value = None
+                if (value and not ifnot) or (ifnot and not value):
+                    return self.nodelist_true.render(context)
+            return self.nodelist_false.render(context)
+        else:
+            for ifnot, bool_expr in self.bool_exprs:
+                try:
+                    value = bool_expr.resolve(context)
+                except VariableDoesNotExist:
+                    value = None
+                if not ((value and not ifnot) or (ifnot and not value)):
+                    return self.nodelist_false.render(context)
+            return self.nodelist_true.render(context)
+
+    class LinkTypes:
+        and_ = 0,
+        or_ = 1
 
 class RegroupNode(Node):
     def __init__(self, target, expression, var_name):
@@ -561,11 +576,22 @@ def do_if(parser, token):
     if not bits:
         raise TemplateSyntaxError, "'if' statement requires at least one argument"
     # bits now looks something like this: ['a', 'or', 'not', 'b', 'or', 'c.d']
-    boolpairs = ' '.join(bits).split(' or ')
+    bitstr = ' '.join(bits)
+    boolpairs = bitstr.split(' and ')
     boolvars = []
+    if len(boolpairs) == 1:
+        link_type = IfNode.LinkTypes.or_
+        boolpairs = bitstr.split(' or ')
+    else:
+        link_type = IfNode.LinkTypes.and_
+        if ' or ' in bitstr:
+            raise TemplateSyntaxError, "'if' tags can't mix 'and' and 'or'"
     for boolpair in boolpairs:
         if ' ' in boolpair:
-            not_, boolvar = boolpair.split()
+            try:
+                not_, boolvar = boolpair.split()
+            except ValueError:
+                raise TemplateSyntaxError, "'if' statement improperly formatted"
             if not_ != 'not':
                 raise TemplateSyntaxError, "Expected 'not' in if statement"
             boolvars.append((True, parser.compile_filter(boolvar)))
@@ -578,7 +604,7 @@ def do_if(parser, token):
         parser.delete_first_token()
     else:
         nodelist_false = NodeList()
-    return IfNode(boolvars, nodelist_true, nodelist_false)
+    return IfNode(boolvars, nodelist_true, nodelist_false, link_type)
 do_if = register.tag("if", do_if)
 
 #@register.tag