diff options
Diffstat (limited to 'chimere/widgets.py')
| -rw-r--r-- | chimere/widgets.py | 11 |
1 files changed, 7 insertions, 4 deletions
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( |