Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.7.x] Complemented 1.6 release notes for 457c16d

And accessorily added missing bits fixing #23293.
  • Loading branch information...
commit 2cbafd814f151b8c926ed8a955627edb8ea23b23 1 parent b578404
@claudep claudep authored
View
6 django/contrib/gis/static/gis/js/OLMapWidget.js
@@ -359,13 +359,13 @@ MapWidget.prototype.getControls = function(layer) {
this.controls = [new OpenLayers.Control.Navigation()];
if (!this.options.modifiable && layer.features.length)
return;
- if (this.options.geom_name.indexOf('LineString') >= 0 || this.options.geom_name == 'Unknown') {
+ if (this.options.geom_name.indexOf('LineString') >= 0 || this.options.geom_name == 'GeometryCollection' || this.options.geom_name == 'Unknown') {
this.controls.push(new OpenLayers.Control.DrawFeature(layer, OpenLayers.Handler.Path, {'displayClass': 'olControlDrawFeaturePath'}));
}
- if (this.options.geom_name.indexOf('Polygon') >= 0 || this.options.geom_name == 'Unknown') {
+ if (this.options.geom_name.indexOf('Polygon') >= 0 || this.options.geom_name == 'GeometryCollection' || this.options.geom_name == 'Unknown') {
this.controls.push(new OpenLayers.Control.DrawFeature(layer, OpenLayers.Handler.Polygon, {'displayClass': 'olControlDrawFeaturePolygon'}));
}
- if (this.options.geom_name.indexOf('Point') >= 0 || this.options.geom_name == 'Unknown') {
+ if (this.options.geom_name.indexOf('Point') >= 0 || this.options.geom_name == 'GeometryCollection' || this.options.geom_name == 'Unknown') {
this.controls.push(new OpenLayers.Control.DrawFeature(layer, OpenLayers.Handler.Point, {'displayClass': 'olControlDrawFeaturePoint'}));
}
if (this.options.modifiable) {
View
4 docs/releases/1.6.6.txt
@@ -36,3 +36,7 @@ Bugfixes
* Prevented ``UnicodeDecodeError`` in ``runserver`` with non-UTF-8 and
non-English locale (`#23265 <https://code.djangoproject.com/ticket/23265>`_).
+
+* Fixed JavaScript errors while editing multi-geometry objects in the OpenLayers
+ widget (`#23137 <https://code.djangoproject.com/ticket/23137>`_,
+ `#23293 <https://code.djangoproject.com/ticket/23293>`_).
Please sign in to comment.
Something went wrong with that request. Please try again.