diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-05-24 23:49:21 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-05-24 23:49:21 +0200 |
| commit | 9df92736ed8b57c39e0deb85d7c536e56535321b (patch) | |
| tree | 62e86f7b2eacee29ad92c57ba457432abfb8145c | |
| parent | 7ee392511f2f1d543a982a78527067b5afd8dfea (diff) | |
| download | Chimère-9df92736ed8b57c39e0deb85d7c536e56535321b.tar.bz2 Chimère-9df92736ed8b57c39e0deb85d7c536e56535321b.zip | |
Fix polygon form
| -rw-r--r-- | chimere/templates/chimere/blocks/polygon_edit.html | 4 | ||||
| -rw-r--r-- | chimere/widgets.py | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/chimere/templates/chimere/blocks/polygon_edit.html b/chimere/templates/chimere/blocks/polygon_edit.html index 5e08e5a..929ac9d 100644 --- a/chimere/templates/chimere/blocks/polygon_edit.html +++ b/chimere/templates/chimere/blocks/polygon_edit.html @@ -7,10 +7,10 @@ var CENTER_LONLAT = centerLonLat = ol.proj.transform( {center}, epsg_display_projection, epsg_projection); var DEFAULT_ZOOM = {zoom}; - {{extra_js|safe}} + {extra_js} var chimere_init_options = {% raw %}{{}}{% endraw %}; chimere_init_options["input_id"] = 'id_{{name}}'; - {% if map_layers %}chimere_init_options["map_layers"] = [{map_layers}];{% endif %} + chimere_init_options["map_layers"] = [{map_layers}]; chimere_init_options['dynamic_categories'] = false; chimere_init_options['edition'] = true; chimere_init_options['edition_type'] = 'polygon'; diff --git a/chimere/widgets.py b/chimere/widgets.py index 7d92684..2a8bc5d 100644 --- a/chimere/widgets.py +++ b/chimere/widgets.py @@ -658,7 +658,7 @@ class PolygonChooserWidget(forms.TextInput): {'name': name, 'val': val, 'initialized': initialized, 'isvalue': bool(value), 'default_area': "true" if default_area else "false", - 'value': value, 'extra_js': u"\n".join(extra_js), + 'value': value } ) return mark_safe(tpl.format( @@ -667,7 +667,8 @@ class PolygonChooserWidget(forms.TextInput): projection=settings.CHIMERE_EPSG_PROJECTION, center=list(settings.CHIMERE_DEFAULT_CENTER), zoom=zoom, - map_layers=", ".join(map_layers) + map_layers=u", ".join(map_layers), + extra_js=u"\n".join(extra_js), )) |