p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #28039 -- Fixed crash in BaseGeometryWidget.subwidgets().

This commit is contained in:
Tim Graham 2017-04-20 11:36:40 -04:00 committed by GitHub
parent 6d7cbe67f0
commit d2cb7a2bc1
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/contrib/gis/forms/widgets.py
View File

@ -41,6 +41,7 @@ class BaseGeometryWidget(Widget):
return None return None
def get_context(self, name, value, attrs): 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 # If a string reaches here (via a validation error on another
# field) then just reconstruct the Geometry. # field) then just reconstruct the Geometry.
if value and isinstance(value, str): if value and isinstance(value, str):
@ -62,7 +63,7 @@ class BaseGeometryWidget(Widget):
if attrs is None: if attrs is None:
attrs = {} attrs = {}
context = self.build_attrs(self.attrs, dict( context.update(self.build_attrs(self.attrs, dict(
name=name, name=name,
module='geodjango_%s' % name.replace('-', '_'), # JS-safe module='geodjango_%s' % name.replace('-', '_'), # JS-safe
serialized=self.serialize(value), serialized=self.serialize(value),
@ -70,7 +71,7 @@ class BaseGeometryWidget(Widget):
STATIC_URL=settings.STATIC_URL, STATIC_URL=settings.STATIC_URL,
LANGUAGE_BIDI=translation.get_language_bidi(), LANGUAGE_BIDI=translation.get_language_bidi(),
**attrs **attrs
)) )))
return context return context

2
docs/releases/1.11.1.txt
View File

@ -40,3 +40,5 @@ Bugfixes
* Restored the output of the ``class`` attribute in the ``<ul>`` of widgets * Restored the output of the ``class`` attribute in the ``<ul>`` of widgets
that use the ``multiple_input.html`` template. This fixes that use the ``multiple_input.html`` template. This fixes
``ModelAdmin.radio_fields`` with ``admin.HORIZONTAL`` (:ticket:`28059`). ``ModelAdmin.radio_fields`` with ``admin.HORIZONTAL`` (:ticket:`28059`).
* Fixed crash in ``BaseGeometryWidget.subwidgets()`` (:ticket:`28039`).

22
tests/gis_tests/test_geoforms.py
View File

@ -351,7 +351,27 @@ class OSMWidgetTest(SimpleTestCase):
@skipUnlessDBFeature("gis_enabled") @skipUnlessDBFeature("gis_enabled")
class CustomGeometryWidgetTest(SimpleTestCase): class GeometryWidgetTests(SimpleTestCase):
def test_subwidgets(self):
widget = forms.BaseGeometryWidget()
self.assertEqual(
list(widget.subwidgets('name', 'value')),
[{
'is_hidden': False,
'attrs': {
'map_srid': 4326,
'map_width': 600,
'geom_type': 'GEOMETRY',
'map_height': 400,
'display_raw': False,
},
'name': 'name',
'template_name': '',
'value': 'value',
'required': False,
}]
)
def test_custom_serialization_widget(self): def test_custom_serialization_widget(self):
class CustomGeometryWidget(forms.BaseGeometryWidget): class CustomGeometryWidget(forms.BaseGeometryWidget):