diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-06-18 17:58:48 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-06-18 17:58:48 +0200 |
| commit | fd0c17b2f79c8167fd44677985a76dec6a2b4b40 (patch) | |
| tree | 18235aea85ac7801067a728a323877cf3c3138b5 | |
| parent | 22cb85975464ddeef3e688a0596f5c649e955e95 (diff) | |
| download | Chimère-fd0c17b2f79c8167fd44677985a76dec6a2b4b40.tar.bz2 Chimère-fd0c17b2f79c8167fd44677985a76dec6a2b4b40.zip | |
Default to Openlayers for edition
| -rw-r--r-- | chimere/templates/chimere/edit.html | 2 | ||||
| -rw-r--r-- | chimere/templatetags/chimere_tags.py | 2 | ||||
| -rw-r--r-- | chimere/widgets.py | 11 |
3 files changed, 9 insertions, 6 deletions
diff --git a/chimere/templates/chimere/edit.html b/chimere/templates/chimere/edit.html index f9706d3..509e740 100644 --- a/chimere/templates/chimere/edit.html +++ b/chimere/templates/chimere/edit.html @@ -3,7 +3,7 @@ {% block extra_head %} {{ form.media }} {{ block.super }} - {% head_chimere %} + {% head_chimere False %} {% if dated %} <!--script type="text/javascript" src="{{extra_url}}media/js/core.js"></script--> <script type="text/javascript" src="{{ STATIC_URL }}chimere/js/utils.js"></script> diff --git a/chimere/templatetags/chimere_tags.py b/chimere/templatetags/chimere_tags.py index 406aa0c..b285bfd 100644 --- a/chimere/templatetags/chimere_tags.py +++ b/chimere/templatetags/chimere_tags.py @@ -143,7 +143,7 @@ def head_chimere(context, view=True): "DEFAULT_CENTER": settings.CHIMERE_DEFAULT_CENTER, "DEFAULT_ZOOM": settings.CHIMERE_DEFAULT_ZOOM, "MAP_LAYER": settings.CHIMERE_DEFAULT_MAP_LAYER, - "CHIMERE_VIEW_RENDERER": settings.CHIMERE_VIEW_RENDERER, + "CHIMERE_VIEW_RENDERER": map_renderer, "MAP_CONDITIONNAL_CSS_URLS": settings.MAP_CONDITIONNAL_CSS_URLS[map_renderer], "MAP_JS_URLS": settings.MAP_JS_URLS[map_renderer], 'routing': settings.CHIMERE_ENABLE_ROUTING \ diff --git a/chimere/widgets.py b/chimere/widgets.py index 8416690..a9aa3dc 100644 --- a/chimere/widgets.py +++ b/chimere/widgets.py @@ -59,7 +59,7 @@ def getMapJS(map_name=''): u"%s// !--></script>\n" % js return js -def get_map_layers(map_name=''): +def get_map_layers(map_name='', force_default=False): from chimere.models import Map map = None if map_name: @@ -73,7 +73,7 @@ def get_map_layers(map_name=''): except ObjectDoesNotExist: pass map_layers, default = [], None - if map and map.layers.count(): + if not force_default and map and map.layers.count(): map_layers = [[layer.name, layer.layer_code, False] for layer in map.layers.order_by('maplayers__order').all()] def_layer = map.layers.filter(maplayers__default=True) @@ -85,7 +85,7 @@ def get_map_layers(map_name=''): map_layers[order][2] = True else: map_layers[0][2] = True - elif settings.CHIMERE_DEFAULT_MAP_LAYER: + elif not force_default and settings.CHIMERE_DEFAULT_MAP_LAYER: map_layers = [(_(u"Default layer"), settings.CHIMERE_DEFAULT_MAP_LAYER, True)] else: @@ -273,7 +273,10 @@ class PointChooserWidget(forms.TextInput): value = None else: value = None - map_layers, default_map = get_map_layers(map_name) + force = False + if settings.CHIMERE_EDIT_RENDERER != settings.CHIMERE_VIEW_RENDERER: + force = True + map_layers, default_map = get_map_layers(map_name, force_default=force) map_layers = [js for n, js, default in map_layers] #TODO: manage maps return mark_safe( |