diff --git a/ietf/group/forms.py b/ietf/group/forms.py index 53605d61f..99650eb51 100644 --- a/ietf/group/forms.py +++ b/ietf/group/forms.py @@ -5,6 +5,7 @@ from __future__ import absolute_import, print_function, unicode_literals # Stdlib imports +import datetime import re import debug # pyflakes:ignore @@ -297,7 +298,7 @@ class AddUnavailablePeriodForm(forms.ModelForm): def __init__(self, *args, **kwargs): super(AddUnavailablePeriodForm, self).__init__(*args, **kwargs) - self.fields["start_date"] = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={"autoclose": "1" }, label=self.fields["start_date"].label, help_text=self.fields["start_date"].help_text, required=self.fields["start_date"].required) + self.fields["start_date"] = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={"autoclose": "1" }, label=self.fields["start_date"].label, help_text=self.fields["start_date"].help_text, required=self.fields["start_date"].required, initial=datetime.date.today()) self.fields["end_date"] = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={"autoclose": "1" }, label=self.fields["end_date"].label, help_text=self.fields["end_date"].help_text, required=self.fields["end_date"].required) self.fields['availability'].widget = forms.RadioSelect(choices=UnavailablePeriod.LONG_AVAILABILITY_CHOICES) diff --git a/ietf/group/tests_review.py b/ietf/group/tests_review.py index bd8845ae7..cad0ff42a 100644 --- a/ietf/group/tests_review.py +++ b/ietf/group/tests_review.py @@ -310,6 +310,7 @@ class ReviewTests(TestCase): # get r = self.client.get(url) self.assertEqual(r.status_code, 200) + self.assertEqual(r.context['period_form']['start_date'].initial, datetime.date.today()) # set settings empty_outbox() diff --git a/ietf/review/models.py b/ietf/review/models.py index 88fd823d0..a701e6f0d 100644 --- a/ietf/review/models.py +++ b/ietf/review/models.py @@ -63,7 +63,7 @@ class ReviewSecretarySettings(models.Model): class UnavailablePeriod(models.Model): team = ForeignKey(Group, limit_choices_to=~models.Q(reviewteamsettings=None)) person = ForeignKey(Person) - start_date = models.DateField(default=datetime.date.today, null=True, help_text="Choose the start date so that you can still do a review if it's assigned just before the start date - this usually means you should mark yourself unavailable for assignment some time before you are actually away.") + start_date = models.DateField(default=datetime.date.today, null=True, help_text="Choose the start date so that you can still do a review if it's assigned just before the start date - this usually means you should mark yourself unavailable for assignment some time before you are actually away. The default is today.") end_date = models.DateField(blank=True, null=True, help_text="Leaving the end date blank means that the period continues indefinitely. You can end it later.") AVAILABILITY_CHOICES = [ ("canfinish", "Can do follow-ups"),