Skip to content

Commit 3d747db

Browse files
committed
Delete * of date field in remider dates
Fixes ietf-tools#1031 - Legacy-Id: 5709
1 parent faa62e2 commit 3d747db

2 files changed

Lines changed: 17 additions & 3 deletions

File tree

ietf/nomcom/forms.py

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from ietf.name.models import RoleName, FeedbackType, NomineePositionState
2222
from ietf.person.models import Email, Person
2323
from ietf.nomcom.models import NomCom, Nomination, Nominee, NomineePosition, \
24-
Position, Feedback
24+
Position, Feedback, ReminderDates
2525
from ietf.nomcom.utils import QUESTIONNAIRE_TEMPLATE, NOMINATION_EMAIL_TEMPLATE, \
2626
INEXISTENT_PERSON_TEMPLATE, NOMINEE_EMAIL_TEMPLATE, \
2727
NOMINATION_RECEIPT_TEMPLATE, FEEDBACK_RECEIPT_TEMPLATE, \
@@ -803,3 +803,14 @@ def save(self, commit=True):
803803
for (position, nominee) in self.cleaned_data['nominee']:
804804
feedback.nominees.add(nominee)
805805
feedback.positions.add(position)
806+
807+
808+
class ReminderDatesForm(forms.ModelForm):
809+
810+
class Meta:
811+
model = ReminderDates
812+
fields = ('date',)
813+
814+
def __init__(self, *args, **kwargs):
815+
super(ReminderDatesForm, self).__init__(*args, **kwargs)
816+
self.fields['date'].required = False

ietf/nomcom/views.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
from ietf.nomcom.decorators import member_required, private_key_required
2323
from ietf.nomcom.forms import (NominateForm, FeedbackForm, QuestionnaireForm,
2424
MergeForm, NomComTemplateForm, PositionForm,
25-
PrivateKeyForm, EditNomcomForm, PendingFeedbackForm)
25+
PrivateKeyForm, EditNomcomForm, PendingFeedbackForm,
26+
ReminderDatesForm)
2627
from ietf.nomcom.models import Position, NomineePosition, Nominee, Feedback, NomCom, ReminderDates
2728
from ietf.nomcom.utils import (get_nomcom_by_year, HOME_TEMPLATE,
2829
store_nomcom_private_key, get_hash_nominee_position,
@@ -447,7 +448,9 @@ def edit_nomcom(request, year):
447448

448449
message = ('warning', 'Previous data will remain encrypted with the old key')
449450

450-
ReminderDateInlineFormSet = inlineformset_factory(NomCom, ReminderDates)
451+
ReminderDateInlineFormSet = inlineformset_factory(parent_model=NomCom,
452+
model=ReminderDates,
453+
form=ReminderDatesForm)
451454
if request.method == 'POST':
452455
formset = ReminderDateInlineFormSet(request.POST, instance=nomcom)
453456
form = EditNomcomForm(request.POST,

0 commit comments

Comments
 (0)