test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #10872 -- Geographic admin now supports new `list_editable` option. Thanks to Dane Springmeyer and Alex Gaynor for the solution. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10636 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Justin Bronn 2009-04-26 06:08:26 +00:00
parent 1269f9a3e9
commit d2c4c02251
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
django/contrib/gis/admin/widgets.py
View File

@ -38,9 +38,14 @@ class OpenLayersWidget(Textarea):
# Constructing the dictionary of the map options. # Constructing the dictionary of the map options.
self.params['map_options'] = self.map_options() self.params['map_options'] = self.map_options()
# Constructing the JavaScript module name using the ID of # Constructing the JavaScript module name using the name of
# the GeometryField (passed in via the `attrs` keyword). # the GeometryField (passed in via the `attrs` keyword).
self.params['module'] = 'geodjango_%s' % self.params['field_name'] # Use the 'name' attr for the field name (rather than 'field')
self.params['name'] = name
# note: we must switch out dashes for underscores since js
# functions are created using the module variable
js_safe_name = self.params['name'].replace('-','_')
self.params['module'] = 'geodjango_%s' % js_safe_name
if value: if value:
# Transforming the geometry to the projection used on the # Transforming the geometry to the projection used on the

2
django/contrib/gis/templates/gis/admin/openlayers.html
View File

@ -32,6 +32,6 @@
<div id="{{ id }}_map"{% if LANGUAGE_BIDI %} dir="ltr"{% endif %}></div> <div id="{{ id }}_map"{% if LANGUAGE_BIDI %} dir="ltr"{% endif %}></div>
<a href="javascript:{{ module }}.clearFeatures()">Delete all Features</a> <a href="javascript:{{ module }}.clearFeatures()">Delete all Features</a>
{% if display_wkt %}<p> WKT debugging window:</p>{% endif %} {% 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="{{ name }}">{{ wkt }}</textarea>
<script type="text/javascript">{% block init_function %}{{ module }}.init();{% endblock %}</script> <script type="text/javascript">{% block init_function %}{{ module }}.init();{% endblock %}</script>
</span> </span>