Ticket #8087: django-ifin-templatetag.patch

django/template/defaulttags.py

@@ -15 +15 @@
 from django.utils.encoding import smart_str, smart_unicode
 from django.utils.itercompat import groupby
 from django.utils.safestring import mark_safe
+from django.db.models.query import QuerySet
 
 register = Library()
 
@@ -258 +259 @@
         and_ = 0,
         or_ = 1
 
+
+class IfInNode(Node):
+    def __init__(self, nodelist_in, nodelist_not_in, element_var, sequence_var):
+        self.nodelist_in = nodelist_in
+        self.nodelist_not_in = nodelist_not_in
+        self.element_var = Variable(element_var)
+        self.sequence_var = Variable(sequence_var)
+
+    def render(self, context):
+        try:
+            element = self.element_var.resolve(context)
+            sequence = self.sequence_var.resolve(context)
+        except VariableDoesNotExist:
+            return self.nodelist_not_in.render(context)
+        if isinstance(sequence, QuerySet):
+            # QuerySets are checked at the database level,
+            # by comparing primary keys
+            if not hasattr(element, 'pk'):
+                return self.nodelist_not_in.render(context)
+            if sequence.filter(pk=element.pk).count() > 0:
+                return self.nodelist_in.render(context)
+            else:
+                return self.nodelist_not_in.render(context)
+        if (element in sequence):
+            return self.nodelist_in.render(context)
+        else:
+            return self.nodelist_not_in.render(context)
+
+
 class RegroupNode(Node):
     def __init__(self, target, expression, var_name):
         self.target, self.expression = target, expression
@@ -815 +845 @@
 ifchanged = register.tag(ifchanged)
 
 #@register.tag
+def ifin(parser, token):
+    """
+    Checks if element is present in the sequence.
+
+    {% ifin element sequence %}
+        Element is in sequence
+    {% else %}
+        Element is in sequence... not!
+    {% endifin %}
+    """
+    try:
+        tag_name, element_var, sequence_var = token.split_contents()
+    except ValueError:
+        raise TemplateSyntaxError, \
+                "%r tag requires two arguments: element and sequence" % token.contents.split()[0]
+    nodelist_in = parser.parse(('endifin', 'else'))
+    token = parser.next_token()
+    if token.contents == 'else':
+        nodelist_not_in = parser.parse(('endifin',))
+        parser.delete_first_token()
+    else:
+        nodelist_not_in = NodeList()
+    return IfInNode(nodelist_in, nodelist_not_in, element_var, sequence_var)
+ifin = register.tag(ifin)
+
+#@register.tag
+def ifnotin(parser, token):
+    """
+    Checks if element is not present in the sequence.
+
+    {% ifnotin element sequence %}
+        Element is in sequence... not!
+    {% else %}
+        Element is in sequence
+    {% endifnotin %}
+    """
+    try:
+        tag_name, element_var, sequence_var = token.split_contents()
+    except ValueError:
+        raise TemplateSyntaxError, \
+                "%r tag requires two arguments: element and sequence" % token.contents.split()[0]
+    nodelist_not_in = parser.parse(('endifnotin','else'))
+    token = parser.next_token()
+    if token.contents == 'else':
+        nodelist_in = parser.parse(('endifnotin',))
+        parser.delete_first_token()
+    else:
+        nodelist_in = NodeList()
+    return IfInNode(nodelist_in, nodelist_not_in, element_var, sequence_var)
+ifnotin = register.tag(ifnotin)
+
+#@register.tag
 def ssi(parser, token):
     """
     Outputs the contents of a given file into the page.

tests/regressiontests/templates/tests.py

@@ -617 +617 @@
             'ifnotequal03': ("{% ifnotequal a b %}yes{% else %}no{% endifnotequal %}", {"a": 1, "b": 2}, "yes"),
             'ifnotequal04': ("{% ifnotequal a b %}yes{% else %}no{% endifnotequal %}", {"a": 1, "b": 1}, "no"),
 
+            ### IFIN TAG ########################################################
+            'ifin01': ("{% ifin a b %}yes{% endifin %}", {"a": 1, "b": [1, 'b', 3]}, "yes"),
+            'ifin02': ("{% ifin a b %}yes{% endifin %}", {"a": 1, "b": ['a', 'b', 3]}, ""),
+            'ifin03': ("{% ifin a b %}yes{% else %}no{% endifin %}", {"a": 1, "b": [1, 'b', 3]}, "yes"),
+            'ifin04': ("{% ifin a b %}yes{% else %}no{% endifin %}", {"a": 1, "b": ['a', 'b', 3]}, "no"),
+
+            ### IFNOTIN TAG ########################################################
+            'ifnotin01': ("{% ifnotin a b %}yes{% endifnotin %}", {"a": 1, "b": [1, 'b', 3]}, ""),
+            'ifnotin02': ("{% ifnotin a b %}yes{% endifnotin %}", {"a": 1, "b": ['a', 'b', 3]}, "yes"),
+            'ifnotin03': ("{% ifnotin a b %}yes{% else %}no{% endifnotin %}", {"a": 1, "b": [1, 'b', 3]}, "no"),
+            'ifnotin04': ("{% ifnotin a b %}yes{% else %}no{% endifnotin %}", {"a": 1, "b": ['a', 'b', 3]}, "yes"),
+
             ### INCLUDE TAG ###########################################################
             'include01': ('{% include "basic-syntax01" %}', {}, "something cool"),
             'include02': ('{% include "basic-syntax02" %}', {'headline': 'Included'}, "Included"),