Ticket #19139: patch2.diff

django/contrib/gis/admin/widgets.py

@@ -64 +64 @@
             # Setting the parameter WKT with that of the transformed
             # geometry.
             self.params['wkt'] = wkt
+            self.params['value'] = value
 
         return loader.render_to_string(self.template, self.params,
                                        context_instance=geo_context)

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

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

new file django/contrib/gis/tests/geoadmin/admin.py

@@ +1 @@
+from django.contrib.gis import admin
+
+
+class UnmodifiableAdmin(admin.OSMGeoAdmin):
+    modifiable = False

django/contrib/gis/tests/geoadmin/tests.py

@@ -5 +5 @@
 from django.contrib.gis.geos import GEOSGeometry, Point
 
 from .models import City
+from .admin import UnmodifiableAdmin
 
 
 class GeoAdminTest(TestCase):
@@ -23 +24 @@
             """geodjango_point.layers.base = new OpenLayers.Layer.OSM("OpenStreetMap (Mapnik)");""",
             result)
 
+        self.assertIn(
+            """<a href="javascript:geodjango_point.clearFeatures()">Delete all Features</a>""",
+            result)
+
+        admin.site.unregister(City)
+        admin.site.register(City, UnmodifiableAdmin)
+        geoadmin = admin.site._registry[City]
+        result = geoadmin.get_map_widget(City._meta.get_field('point'))(
+            ).render('point', Point(-79.460734, 40.18476))
+
+        self.assertNotIn(
+            """<a href="javascript:geodjango_point.clearFeatures()">Delete all Features</a>""",
+            result)
+
+
     def test_olmap_WMS_rendering(self):
         admin.site.unregister(City)
         admin.site.register(City, admin.GeoModelAdmin)