From 3d747dbcb77966ddad251cb23572e3bacb4b4c6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Jim=C3=A9nez?= Date: Wed, 8 May 2013 11:00:47 +0000 Subject: [PATCH] Delete * of date field in remider dates Fixes #1031 - Legacy-Id: 5709 --- ietf/nomcom/forms.py | 13 ++++++++++++- ietf/nomcom/views.py | 7 +++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ietf/nomcom/forms.py b/ietf/nomcom/forms.py index dff5611a4..f3ce88971 100644 --- a/ietf/nomcom/forms.py +++ b/ietf/nomcom/forms.py @@ -21,7 +21,7 @@ from ietf.group.models import Group, Role from ietf.name.models import RoleName, FeedbackType, NomineePositionState from ietf.person.models import Email, Person from ietf.nomcom.models import NomCom, Nomination, Nominee, NomineePosition, \ - Position, Feedback + Position, Feedback, ReminderDates from ietf.nomcom.utils import QUESTIONNAIRE_TEMPLATE, NOMINATION_EMAIL_TEMPLATE, \ INEXISTENT_PERSON_TEMPLATE, NOMINEE_EMAIL_TEMPLATE, \ NOMINATION_RECEIPT_TEMPLATE, FEEDBACK_RECEIPT_TEMPLATE, \ @@ -803,3 +803,14 @@ class PendingFeedbackForm(BaseNomcomForm, forms.ModelForm): for (position, nominee) in self.cleaned_data['nominee']: feedback.nominees.add(nominee) feedback.positions.add(position) + + +class ReminderDatesForm(forms.ModelForm): + + class Meta: + model = ReminderDates + fields = ('date',) + + def __init__(self, *args, **kwargs): + super(ReminderDatesForm, self).__init__(*args, **kwargs) + self.fields['date'].required = False diff --git a/ietf/nomcom/views.py b/ietf/nomcom/views.py index c9ebacd6d..015273627 100644 --- a/ietf/nomcom/views.py +++ b/ietf/nomcom/views.py @@ -22,7 +22,8 @@ from ietf.name.models import NomineePositionState, FeedbackType from ietf.nomcom.decorators import member_required, private_key_required from ietf.nomcom.forms import (NominateForm, FeedbackForm, QuestionnaireForm, MergeForm, NomComTemplateForm, PositionForm, - PrivateKeyForm, EditNomcomForm, PendingFeedbackForm) + PrivateKeyForm, EditNomcomForm, PendingFeedbackForm, + ReminderDatesForm) from ietf.nomcom.models import Position, NomineePosition, Nominee, Feedback, NomCom, ReminderDates from ietf.nomcom.utils import (get_nomcom_by_year, HOME_TEMPLATE, store_nomcom_private_key, get_hash_nominee_position, @@ -447,7 +448,9 @@ def edit_nomcom(request, year): message = ('warning', 'Previous data will remain encrypted with the old key') - ReminderDateInlineFormSet = inlineformset_factory(NomCom, ReminderDates) + ReminderDateInlineFormSet = inlineformset_factory(parent_model=NomCom, + model=ReminderDates, + form=ReminderDatesForm) if request.method == 'POST': formset = ReminderDateInlineFormSet(request.POST, instance=nomcom) form = EditNomcomForm(request.POST,