Summary: Rewrite community tags to use the much simpler built-in tag parser

 - Legacy-Id: 8968

Author: OleLaursen

ietf/community/templatetags/community_tags.py

@@ -8,47 +8,25 @@
 
 register = template.Library()
 
-
-class CommunityListNode(template.Node):
-
-    def __init__(self, user, var_name):
-        self.user = user
-        self.var_name = var_name
-
-    def render(self, context):
-        user = self.user.resolve(context)
-        if not (user and hasattr(user, "is_authenticated") and user.is_authenticated() ):
-            return ''
-        lists = {'personal': CommunityList.objects.get_or_create(user=user)[0]}
-        try:
-            person = user.person
-            groups = []
-            managed_areas = [i.group for i in Role.objects.filter(name__slug='ad', email__in=person.email_set.all())]
-            for area in managed_areas:
-                groups.append(CommunityList.objects.get_or_create(group=area)[0])
-            managed_wg = [i.group for i in Role.objects.filter(name__slug='chair', group__type__slug='wg', email__in=person.email_set.all())]
-            for wg in managed_wg:
-                groups.append(CommunityList.objects.get_or_create(group=wg)[0])
-            lists['group'] = groups
-        except:
-            pass
-        context.update({self.var_name: lists})
+@register.assignment_tag
+def get_user_managed_lists(user):
+    if not (user and hasattr(user, "is_authenticated") and user.is_authenticated()):
         return ''
-
-
-@register.tag
-def get_user_managed_lists(parser, token):
-    firstbits = token.contents.split(None, 2)
-    if len(firstbits) != 3:
-        raise template.TemplateSyntaxError("'get_user_managed_lists' tag takes three arguments")
-    user = parser.compile_filter(firstbits[1])
-    lastbits_reversed = firstbits[2][::-1].split(None, 2)
-    if lastbits_reversed[1][::-1] != 'as':
-        raise template.TemplateSyntaxError("next-to-last argument to 'get_user_managed_lists' tag must"
-                                  " be 'as'")
-    var_name = lastbits_reversed[0][::-1]
-    return CommunityListNode(user, var_name)
-
+    lists = {'personal': CommunityList.objects.get_or_create(user=user)[0]}
+    print lists
+    try:
+        person = user.person
+        groups = []
+        managed_areas = [i.group for i in Role.objects.filter(name__slug='ad', email__in=person.email_set.all())]
+        for area in managed_areas:
+            groups.append(CommunityList.objects.get_or_create(group=area)[0])
+        managed_wg = [i.group for i in Role.objects.filter(name__slug='chair', group__type__slug='wg', email__in=person.email_set.all())]
+        for wg in managed_wg:
+            groups.append(CommunityList.objects.get_or_create(group=wg)[0])
+        lists['group'] = groups
+    except:
+        pass
+    return lists
 
 @register.inclusion_tag('community/display_field.html', takes_context=False)
 def show_field(field, doc):
@@ -57,25 +35,11 @@ def show_field(field, doc):
            }
 
 
-class CommunityListViewNode(template.Node):
-
-    def __init__(self, clist):
-        self.clist = clist
-
-    def render(self, context):
-        clist = self.clist.resolve(context)
+@register.simple_tag
+def get_clist_view(clist):
         if settings.DEBUG or not clist.cached:
             clist.cached = render_to_string('community/raw_view.html',
                                             {'cl': clist,
                                              'dc': clist.get_display_config()})
             clist.save()
         return clist.cached
-
-
-@register.tag
-def get_clist_view(parser, token):
-    firstbits = token.contents.split(None, 1)
-    if len(firstbits) != 2:
-        raise template.TemplateSyntaxError("'get_clist_view' tag takes one argument")
-    clist = parser.compile_filter(firstbits[1])
-    return CommunityListViewNode(clist)