Ticket #1209: ifequal_AND_OR_Support.patch

django/core/template/defaulttags.py

@@ -132 +132 @@
             return ''
 
 class IfEqualNode(Node):
-    def __init__(self, var1, var2, nodelist_true, nodelist_false, negate):
-        self.var1, self.var2 = var1, var2
+    def __init__(self, variables, nodelist_true, nodelist_false, negate):
+        self.variables = variables
         self.nodelist_true, self.nodelist_false = nodelist_true, nodelist_false
         self.negate = negate
 
@@ -141 +141 @@
         return "<IfEqualNode>"
 
     def render(self, context):
-        val1 = resolve_variable(self.var1, context)
-        val2 = resolve_variable(self.var2, context)
-        if (self.negate and val1 != val2) or (not self.negate and val1 == val2):
-            return self.nodelist_true.render(context)
+        val1 = resolve_variable(self.variables[1], context)
+        val2 = resolve_variable(self.variables[2], context)
+        if len(self.variables) > 3:
+            operator = self.variables[3]
+            val3 = resolve_variable(self.variables[4], context)
+            val4 = resolve_variable(self.variables[5], context)
+            if operator == 'OR':
+                if ((self.negate and val1 != val2) or (not self.negate and val1 == val2) or ((self.negate and val3 != val4) or (not self.negate and val3 == val4))):
+                    return self.nodelist_true.render(context)
+            else:
+                if ((self.negate and val1 != val2) or (not self.negate and val1 == val2) and ((self.negate and val3 != val4) or (not self.negate and val3 == val4))):
+                    return self.nodelist_true.render(context)
+        else:
+            if (self.negate and val1 != val2) or (not self.negate and val1 == val2):
+                return self.nodelist_true.render(context)
         return self.nodelist_false.render(context)
 
 class IfNode(Node):
@@ -478 +489 @@
         {% else %}
             ...
         {% endifnotequal %}
+
+        {% ifequal user.id comment.user_id OR user.id owner.user_id %}
+            ...
+        {% endifequal %}
+
+        {% ifequal user.id comment.user_id AND user.id owner.user_id %}
+            ...
+        {% endifequal %}
     """
     bits = token.contents.split()
-    if len(bits) != 3:
+    operator = ''
+    if len(bits) > 3:
+        operator = bits[3]
+    if operator == '' and len(bits) != 3:
         raise TemplateSyntaxError, "%r takes two arguments" % bits[0]
+    elif operator != '' and len(bits) < 6:
+        raise TemplateSyntaxError, "%r takes four arguments when using OR or AND" % bits[0]
+        
     end_tag = 'end' + bits[0]
     nodelist_true = parser.parse(('else', end_tag))
     token = parser.next_token()
@@ -490 +515 @@
         parser.delete_first_token()
     else:
         nodelist_false = NodeList()
-    return IfEqualNode(bits[1], bits[2], nodelist_true, nodelist_false, negate)
+    return IfEqualNode(bits, nodelist_true, nodelist_false, negate)
 
 #@register.tag
 def ifequal(parser, token):

tests/othertests/templates.py

@@ -177 +177 @@
     'ifequal18': ('{% ifequal a 1.2 %}yes{% else %}no{% endifequal %}', {"a": "1.2"}, "no"),
     'ifequal19': ('{% ifequal a "1.2" %}yes{% else %}no{% endifequal %}', {"a": 1.2}, "no"),
     'ifequal20': ('{% ifequal a "1.2" %}yes{% else %}no{% endifequal %}', {"a": "1.2"}, "yes"),
+    
+    #OR
+    'ifequal21': ('{% ifequal a b OR c d %}yes{% endifequal %}', {"a": 1, "b": 1, "c": 2, "d": 2}, "yes"),
+    'ifequal22': ('{% ifequal a b OR c d %}yes{% endifequal %}', {"a": 1, "b": 2, "c": 2, "d": 2}, "yes"),
+    'ifequal23': ('{% ifequal a b OR c d %}yes{% endifequal %}', {"a": 1, "b": 1, "c": 1, "d": 2}, "yes"),
+    'ifequal24': ('{% ifequal a b OR c d %}yes{% endifequal %}', {"a": 1, "b": 2, "c": 1, "d": 2}, ""),
+    'ifequal25': ('{% ifequal a b OR c d %}yes{% else %}no{% endifequal %}', {"a": 1, "b": 2, "c": 1, "d": 2}, "no"),
+    'ifequal26': ('{% ifequal a b OR c d %}yes{% else %}no{% endifequal %}', {"a": 1, "b": 2, "c": 1, "d": 2}, "no"),
+    
+    #AND
+    'ifequal27': ('{% ifequal a b AND c d %}yes{% endifequal %}', {"a": 1, "b": 1, "c": 2, "d": 2}, "yes"),
+    'ifequal28': ('{% ifequal a b AND c d %}yes{% endifequal %}', {"a": 1, "b": 2, "c": 2, "d": 2}, ""),
+    'ifequal28': ('{% ifequal a b AND c d %}yes{% endifequal %}', {"a": 1, "b": 1, "c": 1, "d": 2}, ""),
+    'ifequal29': ('{% ifequal a b AND c d %}yes{% else %}no{% endifequal %}', {"a": 1, "b": 1, "c": 2, "d": 2}, "yes"),
+    'ifequal30': ('{% ifequal a b AND c d %}yes{% else %}no{% endifequal %}', {"a": 1, "b": 2, "c": 2, "d": 2}, "no"),
+    'ifequal30': ('{% ifequal a b AND c d %}yes{% else %}no{% endifequal %}', {"a": 1, "b": 1, "c": 1, "d": 2}, "no"),
 
     ### IFNOTEQUAL TAG ########################################################
     'ifnotequal01': ("{% ifnotequal a b %}yes{% endifnotequal %}", {"a": 1, "b": 2}, "yes"),