From 2a63f91d31d04727074f8a0d9025bc89d1437690 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Wed, 2 Dec 2015 04:44:42 +0000 Subject: [PATCH] Simplify pass of counts - Legacy-Id: 10527 --- ietf/nomcom/templatetags/nomcom_tags.py | 7 ++----- ietf/nomcom/views.py | 5 +---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/ietf/nomcom/templatetags/nomcom_tags.py b/ietf/nomcom/templatetags/nomcom_tags.py index e3ba1dbfa..dfbfd10c5 100644 --- a/ietf/nomcom/templatetags/nomcom_tags.py +++ b/ietf/nomcom/templatetags/nomcom_tags.py @@ -10,8 +10,7 @@ from ietf.utils.log import log from ietf.doc.templatetags.ietf_filters import wrap_text from ietf.person.models import Person -from ietf.nomcom.models import Feedback -from ietf.nomcom.utils import get_nomcom_by_year, get_user_email, retrieve_nomcom_private_key +from ietf.nomcom.utils import get_nomcom_by_year, retrieve_nomcom_private_key import debug # pyflakes:ignore @@ -34,9 +33,7 @@ def has_publickey(nomcom): @register.simple_tag def add_num_nominations(counts, position, nominee): - count = 0 - if position.id in counts and nominee.id in counts[position.id]: - count = counts[position.id][nominee.id] + count = counts.get((position.id,nominee.id),0) if count: return '%s ' % (count , nominee.email.address, position, count) else: diff --git a/ietf/nomcom/views.py b/ietf/nomcom/views.py index b556020ab..eac2cf1fa 100644 --- a/ietf/nomcom/views.py +++ b/ietf/nomcom/views.py @@ -392,10 +392,7 @@ def feedback(request, year, public): user_comments = Feedback.objects.filter(nomcom=nomcom, type='comment', author__in=request.user.person.email_set.filter(active='True')) - counter = Counter(user_comments.values_list('positions','nominees')) - counts = dict() - for pos,nom in counter: - counts.setdefault(pos,dict())[nom] = counter[(pos,nom)] + counts = Counter(user_comments.values_list('positions','nominees')) if public: base_template = "nomcom/nomcom_public_base.html"