fix: Fix the div ids to work with admin inlines

Author: Gagaro

CHANGES

@@ -7,6 +7,7 @@ CHANGELOG
 -------------------
 
 - Set a default max zoom in leaflet.forms _setView to avoid an error.
+- Fix the div ids to work with admin inlines.
 
 
 0.21.0 (2017-02-28)

leaflet/forms/widgets.py

@@ -55,10 +55,12 @@ def render(self, name, value, attrs=None):
         if self.geom_type == 'GEOMETRY':
             attrs['geom_type'] = 'Geometry'
 
-        map_id = slugify(attrs.get('id', name)).replace('-', '_')  # JS-safe
+        map_id_css = slugify(attrs.get('id', name))  # id need to have - for the inline formset to replace the prefix
+        map_id = map_id_css.replace('-', '_')  # JS-safe
         attrs.update(id=map_id,
+                     id_css=map_id_css,
                      module='geodjango_%s' % map_id,
-                     id_map=map_id + '_map',
+                     id_map=map_id_css + '-map',
                      id_map_callback=map_id + '_map_callback',
                      loadevent=loadevent,
                      modifiable=self.modifiable,

leaflet/templates/leaflet/admin/widget.html

@@ -26,7 +26,7 @@
 {% endblock vars %}
 
 {% block map %}
-<div id="{{ id }}_div_map">
+<div id="{{ id_css }}-div-map">
     {{ block.super }}
 </div>
 {% endblock map %}

leaflet/templates/leaflet/widget.html

@@ -3,13 +3,13 @@
 
 <style type="text/css">{% block map_css %}
     {% if map_width and map_height %}#{{ id_map }} { width: {{ map_width }}; height: {{ map_height }}; }{% endif %}
-    {% if not display_raw %}#{{ id }} { display: none; }{% endif %}
+    {% if not display_raw %}#{{ id_css }} { display: none; }{% endif %}
     {% endblock map_css %}
 </style>
 
 <script type="text/javascript">
     {% block vars %}var {{ module }} = {};
-    {{ module }}.fieldid = '{{ id }}';
+    {{ module }}.fieldid = '{{ id_css }}';
     {{ module }}.modifiable = {{ modifiable|yesno:"true,false" }};
     {{ module }}.geom_type = '{{ geom_type }}';
     {{ module }}.srid = {{ map_srid }};
@@ -42,4 +42,4 @@
 {% endif %}
 
 {% if display_raw %}<p> Geometry:</p>{% endif %}
-<textarea id="{{ id }}" class="required" cols="150" rows="10" name="{{ name }}">{{ serialized }}</textarea>
+<textarea id="{{ id_css }}" class="required" cols="150" rows="10" name="{{ name }}">{{ serialized }}</textarea>