From e2e6c243a193e71db9d58ebe7c7330780f5a41a3 Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Wed, 18 Dec 2013 10:22:30 +0000 Subject: [PATCH] Remove the complicated tag processing from ballot_icon, instead just decorate the function with @simple_tag(takes_context=True) - Legacy-Id: 6970 --- ietf/doc/templatetags/ballot_icon.py | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/ietf/doc/templatetags/ballot_icon.py b/ietf/doc/templatetags/ballot_icon.py index 18ca432cb..ba3a9aa09 100644 --- a/ietf/doc/templatetags/ballot_icon.py +++ b/ietf/doc/templatetags/ballot_icon.py @@ -62,8 +62,10 @@ def showballoticon(doc): return True +@register.simple_tag(takes_context=True) +def ballot_icon(context, doc): + user = context.get("user") -def render_ballot_icon(doc, user): if not doc: return "" @@ -118,23 +120,6 @@ def render_ballot_icon(doc, user): return "".join(res) -class BallotIconNode(template.Node): - def __init__(self, doc_var): - self.doc_var = doc_var - def render(self, context): - doc = template.resolve_variable(self.doc_var, context) - return render_ballot_icon(doc, context.get("user")) - -def do_ballot_icon(parser, token): - try: - tag_name, doc_name = token.split_contents() - except ValueError: - raise template.TemplateSyntaxError, "%r tag requires exactly two arguments" % token.contents.split()[0] - return BallotIconNode(doc_name) - -register.tag('ballot_icon', do_ballot_icon) - - @register.filter def ballotposition(doc, user): if not showballoticon(doc) or not has_role(user, "Area Director"):