From bf38ef3c34f8b2fb0ed6403bb7781c143cacd943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Jim=C3=A9nez?= Date: Fri, 22 Mar 2013 09:28:51 +0000 Subject: [PATCH] Improve to manage pending feedback errors. See #975 - Legacy-Id: 5585 --- ietf/nomcom/views.py | 4 ++-- ietf/templates/nomcom/view_feedback_pending.html | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ietf/nomcom/views.py b/ietf/nomcom/views.py index df94cb39c..0371af088 100644 --- a/ietf/nomcom/views.py +++ b/ietf/nomcom/views.py @@ -400,8 +400,8 @@ def view_feedback_pending(request, year): exclude=('nomcom', 'comments'), extra=0) feedbacks = Feedback.objects.filter(Q(type__isnull=True) | - Q(nominee__isnull=True) | - Q(positions__isnull=True)) + Q(nominee__isnull=True) | + Q(positions__isnull=True)) if request.method == 'POST': formset = FeedbackFormSet(request.POST) if formset.is_valid(): diff --git a/ietf/templates/nomcom/view_feedback_pending.html b/ietf/templates/nomcom/view_feedback_pending.html index 77a88fe6f..5e74bdcd6 100644 --- a/ietf/templates/nomcom/view_feedback_pending.html +++ b/ietf/templates/nomcom/view_feedback_pending.html @@ -19,11 +19,12 @@
{% csrf_token %} {{ formset.management_form }} {% for form in formset.forms %} -

{{ form.instance.time|date:"Y-m-d" }}

+

{{ form.instance.time|date:"Y-m-d" }} id:{{ form.instance.id }}

+ {% if form.errors %}
Please correct the following errors
{% endif %}
{% for field in form %}
- {% if not field.field.widget.is_hidden %}{{ field.label_tag }}:{% endif %} {{ field }} + {% if not field.field.widget.is_hidden %}{{ field.label_tag }}:{% endif %} {{ field }}{{ field.errors }}
{% endfor %} {% decrypt form.instance.comments request year %}