innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Complemented 1.6 release notes for 457c16d0d6 

And accessorily added missing bits fixing #23293.
Forward port of 2cbafd814 from stable/1.7.x
This commit is contained in:
Claude Paroz 2014-08-15 10:11:53 +02:00
parent 4d2f9c38e8
commit 12adcd505e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -359,13 +359,13 @@ MapWidget.prototype.getControls = function(layer) {
this.controls = [new OpenLayers.Control.Navigation()]; this.controls = [new OpenLayers.Control.Navigation()];
if (!this.options.modifiable && layer.features.length) if (!this.options.modifiable && layer.features.length)
return; 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'})); 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'})); 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'})); this.controls.push(new OpenLayers.Control.DrawFeature(layer, OpenLayers.Handler.Point, {'displayClass': 'olControlDrawFeaturePoint'}));
} }
if (this.options.modifiable) { if (this.options.modifiable) {

4
docs/releases/1.6.6.txt
View File

@ -36,3 +36,7 @@ Bugfixes
* Prevented ``UnicodeDecodeError`` in ``runserver`` with non-UTF-8 and * Prevented ``UnicodeDecodeError`` in ``runserver`` with non-UTF-8 and
non-English locale (`#23265 <https://code.djangoproject.com/ticket/23265>`_). 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>`_).