Ticket #10872: geodjango_widget_list_editable_support.patch

django/contrib/gis/admin/widgets.py

@@ -37 +37 @@
 
         # Constructing the dictionary of the map options.
         self.params['map_options'] = self.map_options()
-
+        
+        # hidden widgets don't set attrs in the same way as other widgets
+        # and therefore seem to accept the auto_id from here:
+        # http://code.djangoproject.com/browser/django/trunk/django/forms/forms.py#L376
+        # and therefore this id gets prefixed with 'id_' which breaks the form fields
+        # expected name when used in a formset
+        
+        # so, an ugly hack therefore to strip the prefix here...
+        self.params['id'] = self.params['id'].lstrip('id_') #.replace('-','_')
+        
         # Constructing the JavaScript module name using the ID of
         # the GeometryField (passed in via the `attrs` keyword).
-        self.params['module'] = 'geodjango_%s' % self.params['field_name']
+        # javascript functions can't handle '-' so switch them out
+        self.params['module'] = self.params['id'].replace('-','_')
+        #self.params['module'] = 'geodjango_%s' % (self.params['field_name'])
 
         if value:
             # Transforming the geometry to the projection used on the

django/contrib/gis/templates/gis/admin/openlayers.html

@@ -32 +32 @@
 <div id="{{ id }}_map"{% if LANGUAGE_BIDI %} dir="ltr"{% endif %}></div>
 <a href="javascript:{{ module }}.clearFeatures()">Delete all Features</a>
 {% if display_wkt %}<p> WKT debugging window:</p>{% endif %}
-<textarea id="{{ id }}" class="vWKTField required" cols="150" rows="10" name="{{ field_name }}">{{ wkt }}</textarea>
+<textarea id="{{ id }}" class="vWKTField required" cols="150" rows="10" name="{{ id }}">{{ wkt }}</textarea>
 <script type="text/javascript">{% block init_function %}{{ module }}.init();{% endblock %}</script>
 </span>

django/contrib/gis/templates/gis/admin/openlayers.js

@@ -107 +107 @@
     {{ module }}.map.addLayer({{ module }}.layers.base);
     {% block extra_layers %}{% endblock %}
     {% if is_linestring %}OpenLayers.Feature.Vector.style["default"]["strokeWidth"] = 3; // Default too thin for linestrings. {% endif %}
-    {{ module }}.layers.vector = new OpenLayers.Layer.Vector(" {{ field_name }}");
+    {{ module }}.layers.vector = new OpenLayers.Layer.Vector("{{ module }}_vectors");
     {{ module }}.map.addLayer({{ module }}.layers.vector);
     // Read WKT from the text field.
     var wkt = document.getElementById('{{ id }}').value;