From 8c985fe44091d45529a73581fc1d98c1f0a41d20 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Mon, 8 Oct 2018 15:11:21 +0000
Subject: [PATCH] Turned the nomcom chair dropdown menu item 'Classify pending
 feedback' into a tab with a mail count badge.  - Legacy-Id: 15544

---
 ietf/api/views.py                              | 2 --
 ietf/nomcom/models.py                          | 3 +++
 ietf/templates/nomcom/nomcom_private_base.html | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ietf/api/views.py b/ietf/api/views.py
index 338459c13..981ebbdb6 100644
--- a/ietf/api/views.py
+++ b/ietf/api/views.py
@@ -68,7 +68,6 @@ class PersonalInformationExportView(DetailView, JsonExportMixin):
     model = Person
 
     def get(self, request):
-        debug.mark()
         person = get_object_or_404(self.model, user=request.user)
         expand = ['searchrule', 'documentauthor', 'ad_document_set', 'ad_dochistory_set', 'docevent',
             'ballotpositiondocevent', 'deletedevent', 'email_set', 'groupevent', 'role', 'rolehistory', 'iprdisclosurebase',
@@ -77,7 +76,6 @@ class PersonalInformationExportView(DetailView, JsonExportMixin):
             'reviewersettings', 'reviewsecretarysettings', 'unavailableperiod', 'reviewwish',
             'nextreviewerinteam', 'reviewrequest', 'meetingregistration', 'submissionevent', 'preapproval',
             'user', 'user__communitylist', ]
-        debug.mark()
         return self.json_view(request, filter={'id':person.id}, expand=expand)
 
 
diff --git a/ietf/nomcom/models.py b/ietf/nomcom/models.py
index 8a5d331e8..9429d2541 100644
--- a/ietf/nomcom/models.py
+++ b/ietf/nomcom/models.py
@@ -75,6 +75,9 @@ class NomCom(models.Model):
                 self._cached_year = year
         return year
 
+    def pending_email_count(self):
+        return self.feedback_set.filter(type__isnull=True).count()
+
 
 def delete_nomcom(sender, **kwargs):
     nomcom = kwargs.get('instance', None)
diff --git a/ietf/templates/nomcom/nomcom_private_base.html b/ietf/templates/nomcom/nomcom_private_base.html
index 0b3c36c35..83fc000fc 100644
--- a/ietf/templates/nomcom/nomcom_private_base.html
+++ b/ietf/templates/nomcom/nomcom_private_base.html
@@ -23,12 +23,13 @@
     <li {% if selected == "private_key" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.private_key' year %}">Private key</a></li>
 
     {% if user|is_chair_or_advisor:year %}
+      <li {% if selected == "feedback_pending" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.view_feedback_pending' year %}">Pending emails&ensp;<span class="badge">{{nomcom.pending_email_count}}</span></a></li>
+
       <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" href="#">Chair/Advisor Tasks <span class="caret"></span></a>
         <ul class="dropdown-menu" role="menu">
           {% if nomcom.group.state_id == 'active' %}
           <li role = "presentation" class = "dropdown-header">Feedback Management</li>
-            <li {% if selected == "feedback_pending" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.view_feedback_pending' year %}">Classify pending feedback</a></li>
             <li {% if selected == "feedback_email" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.private_feedback_email' year %}">Enter email feedback</a></li>
             <li {% if selected == "questionnaire" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.private_questionnaire' year %}">Enter questionnaire response</a></li>
             <li {% if selected == "extract_email_lists" %}class="active"{% endif %}><a href="{% url 'ietf.nomcom.views.extract_email_lists' year %}">Extract email lists</a></li>