Fixed queryset of feedback pending.

See #975
 - Legacy-Id: 5577

ietf/nomcom/forms.py

@@ -1,6 +1,5 @@
 from django.conf import settings
 from django import forms
-from django.forms.models import BaseModelFormSet
 from django.contrib.formtools.preview import FormPreview, AUTO_ID
 from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404
@@ -9,7 +8,6 @@ from django.template.loader import render_to_string
 from django.utils.decorators import method_decorator
 from django.shortcuts import render_to_response
 from django.template.context import RequestContext
-from django.db.models import Q
 
 from ietf.dbtemplate.forms import DBTemplateForm
 from ietf.utils import unaccent
@@ -570,14 +568,6 @@ class FeedbackForm(BaseNomcomForm, forms.ModelForm):
               "/js/nomcom.js", )
 
 
-class BaseFeedbackFormSet(BaseModelFormSet):
-    def __init__(self, *args, **kwargs):
-        super(BaseFeedbackFormSet, self).__init__(*args, **kwargs)
-        self.queryset = Feedback.objects.filter(Q(type__isnull=True) |
-                                                Q(nominee__isnull=True) |
-                                                Q(positions=True))
-
-
 class NomComTemplateForm(BaseNomcomForm, DBTemplateForm):
 
     fieldsets = [('Template content', ('content', )),

ietf/nomcom/views.py

@@ -7,7 +7,7 @@ from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 from django.template.loader import render_to_string
 from django.utils import simplejson
-from django.db.models import Count
+from django.db.models import Count, Q
 from django.forms.models import modelformset_factory
 
 from ietf.utils.mail import send_mail
@@ -18,8 +18,7 @@ from ietf.name.models import NomineePositionState, FeedbackType
 
 from ietf.nomcom.decorators import member_required, private_key_required
 from ietf.nomcom.forms import (EditPublicKeyForm, NominateForm, FeedbackForm, MergeForm,
-                               NomComTemplateForm, PositionForm, PrivateKeyForm,
-                               BaseFeedbackFormSet)
+                               NomComTemplateForm, PositionForm, PrivateKeyForm)
 from ietf.nomcom.models import Position, NomineePosition, Nominee, Feedback
 from ietf.nomcom.utils import (get_nomcom_by_year, HOME_TEMPLATE,
                                retrieve_nomcom_private_key,
@@ -323,16 +322,18 @@ def view_feedback_pending(request, year):
     nomcom = get_nomcom_by_year(year)
     message = None
     FeedbackFormSet = modelformset_factory(Feedback,
-                                           formset=BaseFeedbackFormSet,
                                            exclude=('nomcom', 'comments'),
                                            extra=0)
+    feedbacks = Feedback.objects.filter(Q(type__isnull=True) |
+                                            Q(nominee__isnull=True) |
+                                            Q(positions__isnull=True))
     if request.method == 'POST':
         formset = FeedbackFormSet(request.POST)
         if formset.is_valid():
             formset.save()
             message = ('success', 'The feedbacks has been saved.')
     else:
-        formset = FeedbackFormSet()
+        formset = FeedbackFormSet(queryset=feedbacks)
     return render_to_response('nomcom/view_feedback_pending.html',
                               {'year': year,
                                'selected': 'view_feedback',

ietf/templates/nomcom/view_feedback_pending.html

@@ -19,11 +19,11 @@
   <form id="feedbackformset" action="" method="post">{% csrf_token %}
     {{ formset.management_form }}
     {% for form in formset.forms %}
-     <div class="ietf-divider"></div>
+     <h3 class="ietf-divider">{{ form.instance.time|date:"Y-m-d" }}</h3>
      <div>
         {% for field in form %}
           <div>
-            {{ field.label_tag }}: {{ field }}
+            {% if not field.field.widget.is_hidden %}{{ field.label_tag }}:{% endif %} {{ field }}
           </div>
         {% endfor %}
         {% decrypt form.instance.comments request year %}