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

[1.6.x] Prevented rendering attrs to be squashed in OSMWidget

Browse Source 
Backport of b6889c68d7 from master.
This commit is contained in:
Claude Paroz
2013-09-03 10:01:13 +02:00
parent aa1c175687
commit b53ce2f31c
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
django/contrib/gis/static/gis/js/OLMapWidget.js
View File

@@ -213,7 +213,7 @@ function MapWidget(options) {
var styleMap = new OpenLayers.StyleMap({'default': OpenLayers.Util.applyDefaults(defaults_style, OpenLayers.Feature.Vector.style['default'])}); var styleMap = new OpenLayers.StyleMap({'default': OpenLayers.Util.applyDefaults(defaults_style, OpenLayers.Feature.Vector.style['default'])});
this.layers.vector = new OpenLayers.Layer.Vector(" " + this.options.name, {styleMap: styleMap}); this.layers.vector = new OpenLayers.Layer.Vector(" " + this.options.name, {styleMap: styleMap});
this.map.addLayer(this.layers.vector); this.map.addLayer(this.layers.vector);
wkt = document.getElementById(this.options.id).value; var wkt = document.getElementById(this.options.id).value;
if (wkt) { if (wkt) {
var feat = OpenLayers.Util.properFeatures(this.read_wkt(wkt), this.options.geom_type); var feat = OpenLayers.Util.properFeatures(this.read_wkt(wkt), this.options.geom_type);
this.write_wkt(feat); this.write_wkt(feat);

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

@@ -248,7 +248,9 @@ class SpecializedFieldTest(SimpleTestCase):
geom = self.geometries['point'] geom = self.geometries['point']
form = PointForm(data={'p': geom}) form = PointForm(data={'p': geom})
self.assertIn("OpenStreetMap (Mapnik)", form.as_p()) rendered = form.as_p()
self.assertIn("OpenStreetMap (Mapnik)", rendered)
self.assertIn("id: 'id_p',", rendered)
@skipUnless(HAS_GDAL and HAS_SPATIALREFSYS, @skipUnless(HAS_GDAL and HAS_SPATIALREFSYS,