Skip to content

Commit a7a2ee4

Browse files
author
Sasha Romijn
committed
Fix ietf-tools#2198 - Set default start date for UnavailabilityPeriod to today.
Commit ready for merge. - Legacy-Id: 16891
1 parent 3c2b01b commit a7a2ee4

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

ietf/group/forms.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from __future__ import absolute_import, print_function, unicode_literals
66

77
# Stdlib imports
8+
import datetime
89
import re
910

1011
import debug # pyflakes:ignore
@@ -302,7 +303,7 @@ class Meta:
302303
def __init__(self, *args, **kwargs):
303304
super(AddUnavailablePeriodForm, self).__init__(*args, **kwargs)
304305

305-
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)
306+
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())
306307
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)
307308

308309
self.fields['availability'].widget = forms.RadioSelect(choices=UnavailablePeriod.LONG_AVAILABILITY_CHOICES)

ietf/group/tests_review.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@ def test_change_reviewer_settings(self):
310310
# get
311311
r = self.client.get(url)
312312
self.assertEqual(r.status_code, 200)
313+
self.assertEqual(r.context['period_form']['start_date'].initial, datetime.date.today())
313314

314315
# set settings
315316
empty_outbox()

ietf/review/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class Meta:
6363
class UnavailablePeriod(models.Model):
6464
team = ForeignKey(Group, limit_choices_to=~models.Q(reviewteamsettings=None))
6565
person = ForeignKey(Person)
66-
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.")
66+
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.")
6767
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.")
6868
AVAILABILITY_CHOICES = [
6969
("canfinish", "Can do follow-ups"),

0 commit comments

Comments
 (0)