Turned the nomcom chair dropdown menu item 'Classify pending feedback' into a tab with a mail count badge.

- Legacy-Id: 15544
This commit is contained in:
Henrik Levkowetz 2018-10-08 15:11:21 +00:00
parent 8f2ba33059
commit 8c985fe440
3 changed files with 5 additions and 3 deletions

View file

@ -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)

View file

@ -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)

View file

@ -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>