Author: jbronn
Date: 2008-08-23 02:06:30 -0500 (Sat, 23 Aug 2008)
New Revision: 8480

Modified:
   django/trunk/django/contrib/gis/templates/gis/kml/placemarks.kml
Log:
Fixed #8465. Mark KML input as safe so elements aren't escaped; added some 
defaults for name and description.


Modified: django/trunk/django/contrib/gis/templates/gis/kml/placemarks.kml
===================================================================
--- django/trunk/django/contrib/gis/templates/gis/kml/placemarks.kml    
2008-08-23 05:05:21 UTC (rev 8479)
+++ django/trunk/django/contrib/gis/templates/gis/kml/placemarks.kml    
2008-08-23 07:06:30 UTC (rev 8480)
@@ -1,8 +1,8 @@
 {% extends "gis/kml/base.kml" %}
 {% block placemarks %}{% for place in places %}
   <Placemark>
-    <name>{{ place.name|escape }}</name>
-    <description>{{ place.description|escape }}</description>
-    {{ place.kml }}
+    <name>{% if place.name %}{{ place.name }}{% else %}{{ place }}{% endif 
%}</name>
+    <description>{% if place.description %}{{ place.description }}{% else %}{{ 
place }}{% endif %}</description>
+    {{ place.kml|safe }}
   </Placemark>{% endfor %}{% endblock %}
 


--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to