Skip to content

Fix render() for Django 1.11 #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
blag wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix render() for Django 1.11 #66

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion bootstrap3_datetime/widgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
from django import VERSION
from django.forms.utils import flatatt
from django.forms.widgets import DateTimeInput
from django.utils import translation
Expand Down Expand Up @@ -124,7 +125,15 @@ def __init__(self, attrs=None, format=None, options=None, div_attrs=None, icon_a
def render(self, name, value, attrs=None):
if value is None:
value = ''
input_attrs = self.build_attrs(attrs, type=self.input_type, name=name)
_attrs = attrs or {}
default_attrs = {'type': self.input_type, 'name': name}
if VERSION < (1, 11):
input_attrs = self.build_attrs(_attrs, **default_attrs)
else:
# The signature of build_attrs changed in Django 1.11.
# See https://code.djangoproject.com/ticket/28095
_attrs.update(default_attrs)
input_attrs = self.build_attrs(self.attrs, extra_attrs=_attrs)
if value != '':
# Only add the 'value' attribute if a value is non-empty.
input_attrs['value'] = force_text(self._format_value(value))
Expand Down