mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 01:25:32 +00:00
Code Issues 32 Releases Wiki Activity

[1.6.x] Fixed syntax error in OSMWidget

Browse Source 
Backport of 6ecbac21a from master.
This commit is contained in:
Claude Paroz
2013-09-03 09:05:01 +02:00
parent 0c57868908
commit aa1c175687
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,5 +111,5 @@ class OSMWidget(BaseGeometryWidget):
return 900913 return 900913
def render(self, name, value, attrs=None): def render(self, name, value, attrs=None):
return super(self, OSMWidget).render(name, value, return super(OSMWidget, self).render(name, value,
{'default_lon': self.default_lon, 'default_lat': self.default_lat}) {'default_lon': self.default_lon, 'default_lat': self.default_lat})

9
django/contrib/gis/tests/test_geoforms.py
View File

@@ -242,6 +242,15 @@ class SpecializedFieldTest(SimpleTestCase):
for invalid in [geom for key, geom in self.geometries.items() if key!='geometrycollection']: for invalid in [geom for key, geom in self.geometries.items() if key!='geometrycollection']:
self.assertFalse(GeometryForm(data={'g': invalid.wkt}).is_valid()) self.assertFalse(GeometryForm(data={'g': invalid.wkt}).is_valid())
def test_osm_widget(self):
class PointForm(forms.Form):
p = forms.PointField(widget=forms.OSMWidget)
geom = self.geometries['point']
form = PointForm(data={'p': geom})
self.assertIn("OpenStreetMap (Mapnik)", form.as_p())
@skipUnless(HAS_GDAL and HAS_SPATIALREFSYS, @skipUnless(HAS_GDAL and HAS_SPATIALREFSYS,
"CustomGeometryWidgetTest needs gdal support and a spatial database") "CustomGeometryWidgetTest needs gdal support and a spatial database")
class CustomGeometryWidgetTest(SimpleTestCase): class CustomGeometryWidgetTest(SimpleTestCase):