summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2016-07-30 22:08:50 +0200
committerClaude Paroz <claude@2xlibre.net>2016-07-31 20:40:17 +0200
commit39387efbba11ea964d3aab69bf26899fe874f5f6 (patch)
tree2e0b5a8087adba97b407fdc81f63a5f8d646ee73 /django
parent83b950e9ffd4904500bb9dcc9c7526f4d7899853 (diff)
[1.10.x] Fixed #26972 -- Fixed is_collection definition in MapWidget initialization
Backport of f530b4fdfc2be3c2a0edcf38ebeb12bb5a4f0b83 from master.
Diffstat (limited to 'django')
-rw-r--r--django/contrib/gis/static/gis/js/OLMapWidget.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/gis/static/gis/js/OLMapWidget.js b/django/contrib/gis/static/gis/js/OLMapWidget.js
index 0736779370..c1a56d2f36 100644
--- a/django/contrib/gis/static/gis/js/OLMapWidget.js
+++ b/django/contrib/gis/static/gis/js/OLMapWidget.js
@@ -184,7 +184,7 @@
default_lat: 0,
default_lon: 0,
default_zoom: 4,
- is_collection: new options.geom_type() instanceof OpenLayers.Geometry.Collection,
+ is_collection: options.geom_name.indexOf('Multi') > -1 || options.geom_name.indexOf('Collection') > -1,
layerswitcher: false,
map_options: {},
map_srid: 4326,