diff options
| author | Carlton Gibson <carlton.gibson@noumenal.es> | 2019-11-21 20:53:31 +0100 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2019-11-21 21:06:07 +0100 |
| commit | 947f8e3485b1406d18ea062fd275c083d7ffbed5 (patch) | |
| tree | 1be3a4d282bd237120f11192c5726afe5584c28d /django/forms | |
| parent | 6e3ef9841313efa7ace79cde519c89965206cd4b (diff) | |
[3.0.x] Fixed #31012 -- Reverted "Fixed #29056 -- Fixed HTML5 validation of required SelectDateWidget."
This reverts commit f038214d917c982613f5a15db8dfe325b1f7479b.
The initial issue was incorrect. Django 2.2, and before, did not
generate invalid HTML as reported. With f03821 in place invalid HTML
was generated.
Thanks to Kevin Brown for follow-up report and investigation.
Backport of ee4a19053a32d41cdd79e087b1968980804ce658 from master
Diffstat (limited to 'django/forms')
| -rw-r--r-- | django/forms/widgets.py | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/django/forms/widgets.py b/django/forms/widgets.py index f9627f2918..ba8346ac97 100644 --- a/django/forms/widgets.py +++ b/django/forms/widgets.py @@ -979,11 +979,7 @@ class SelectDateWidget(Widget): date_context['year'] = self.select_widget(attrs, choices=year_choices).get_context( name=year_name, value=context['widget']['value']['year'], - attrs={ - **context['widget']['attrs'], - 'id': 'id_%s' % year_name, - 'placeholder': _('Year') if self.is_required else False, - }, + attrs={**context['widget']['attrs'], 'id': 'id_%s' % year_name}, ) month_choices = list(self.months.items()) if not self.is_required: @@ -992,11 +988,7 @@ class SelectDateWidget(Widget): date_context['month'] = self.select_widget(attrs, choices=month_choices).get_context( name=month_name, value=context['widget']['value']['month'], - attrs={ - **context['widget']['attrs'], - 'id': 'id_%s' % month_name, - 'placeholder': _('Month') if self.is_required else False, - }, + attrs={**context['widget']['attrs'], 'id': 'id_%s' % month_name}, ) day_choices = [(i, i) for i in range(1, 32)] if not self.is_required: @@ -1005,11 +997,7 @@ class SelectDateWidget(Widget): date_context['day'] = self.select_widget(attrs, choices=day_choices,).get_context( name=day_name, value=context['widget']['value']['day'], - attrs={ - **context['widget']['attrs'], - 'id': 'id_%s' % day_name, - 'placeholder': _('Day') if self.is_required else False, - }, + attrs={**context['widget']['attrs'], 'id': 'id_%s' % day_name}, ) subwidgets = [] for field in self._parse_date_fmt(): |