summaryrefslogtreecommitdiff
path: root/django/contrib/gis/forms/widgets.py
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2017-04-20 11:36:40 -0400
committerGitHub <noreply@github.com>2017-04-20 11:36:40 -0400
commitd2cb7a2bc11f111be04a29b5e4f92a183b18ba88 (patch)
tree041ae42efc9fb8056c4d0b2aecb975a454a29b99 /django/contrib/gis/forms/widgets.py
parent6d7cbe67f0a91ce3c576b41dc5650e1e4cdbd4e2 (diff)
Fixed #28039 -- Fixed crash in BaseGeometryWidget.subwidgets().
Diffstat (limited to 'django/contrib/gis/forms/widgets.py')
-rw-r--r--django/contrib/gis/forms/widgets.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/django/contrib/gis/forms/widgets.py b/django/contrib/gis/forms/widgets.py
index 53853b84f3..82d9f26b1c 100644
--- a/django/contrib/gis/forms/widgets.py
+++ b/django/contrib/gis/forms/widgets.py
@@ -41,6 +41,7 @@ class BaseGeometryWidget(Widget):
return None
def get_context(self, name, value, attrs):
+ context = super().get_context(name, value, attrs)
# If a string reaches here (via a validation error on another
# field) then just reconstruct the Geometry.
if value and isinstance(value, str):
@@ -62,7 +63,7 @@ class BaseGeometryWidget(Widget):
if attrs is None:
attrs = {}
- context = self.build_attrs(self.attrs, dict(
+ context.update(self.build_attrs(self.attrs, dict(
name=name,
module='geodjango_%s' % name.replace('-', '_'), # JS-safe
serialized=self.serialize(value),
@@ -70,7 +71,7 @@ class BaseGeometryWidget(Widget):
STATIC_URL=settings.STATIC_URL,
LANGUAGE_BIDI=translation.get_language_bidi(),
**attrs
- ))
+ )))
return context