Author: adrian
Date: 2006-05-31 10:10:01 -0500 (Wed, 31 May 2006)
New Revision: 3023

Modified:
   django/trunk/django/contrib/admin/templates/admin/change_form.html
   django/trunk/django/contrib/admin/templates/admin/filter.html
Log:
Fixed #2006 -- Admin now quotes strings in breadcrumbs and filters. Thanks, 
[EMAIL PROTECTED]

Modified: django/trunk/django/contrib/admin/templates/admin/change_form.html
===================================================================
--- django/trunk/django/contrib/admin/templates/admin/change_form.html  
2006-05-31 15:08:06 UTC (rev 3022)
+++ django/trunk/django/contrib/admin/templates/admin/change_form.html  
2006-05-31 15:10:01 UTC (rev 3023)
@@ -12,7 +12,7 @@
 <div class="breadcrumbs">
      <a href="../../../">{% trans "Home" %}</a> &rsaquo;
      <a href="../">{{ opts.verbose_name_plural|capfirst }}</a> &rsaquo;
-     {% if add %}{% trans "Add" %} {{ opts.verbose_name }}{% else %}{{ 
original|striptags|truncatewords:"18" }}{% endif %}
+     {% if add %}{% trans "Add" %} {{ opts.verbose_name }}{% else %}{{ 
original|truncatewords:"18"|escape }}{% endif %}
 </div>
 {% endif %}{% endblock %}
 {% block content %}<div id="content-main">

Modified: django/trunk/django/contrib/admin/templates/admin/filter.html
===================================================================
--- django/trunk/django/contrib/admin/templates/admin/filter.html       
2006-05-31 15:08:06 UTC (rev 3022)
+++ django/trunk/django/contrib/admin/templates/admin/filter.html       
2006-05-31 15:10:01 UTC (rev 3023)
@@ -3,6 +3,6 @@
 <ul>
 {% for choice in choices %}
     <li{% if choice.selected %} class="selected"{% endif %}>
-    <a href="{{ choice.query_string }}">{{ choice.display }}</a></li>
+    <a href="{{ choice.query_string }}">{{ choice.display|escape }}</a></li>
 {% endfor %}
 </ul>


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

Reply via email to