Django

Code

Changeset 5764

Show
Ignore:
Timestamp:
07/26/07 00:01:53 (1 year ago)
Author:
gwilson
Message:

Fixed #4971 -- Fixed some escaping and quoting problems in the databrowse contrib app. Based on patch from Johann Queuniet.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/AUTHORS

    r5746 r5764  
    215215    Daniel Poelzleithner <http://poelzi.org/> 
    216216    polpak@yahoo.com 
     217    Johann Queuniet <johann.queuniet@adh.naellia.eu> 
    217218    J. Rademaker 
    218219    Michael Radziej <mir@noris.de> 

  • django/trunk/django/contrib/databrowse/plugins/fieldchoices.py

    r5609 r5764  
    3838    def urls(self, plugin_name, easy_instance_field): 
    3939        if easy_instance_field.field in self.field_dict(easy_instance_field.model.model).values(): 
     40            field_value = smart_str(easy_instance_field.raw_value) 
    4041            return [u'%s%s/%s/%s/' % (easy_instance_field.model.url(), 
    4142                plugin_name, easy_instance_field.field.name, 
    42                 urllib.quote(smart_str(easy_instance_field.raw_value)))] 
     43                urllib.quote(field_value, safe=''))] 
    4344 
    4445    def model_view(self, request, model_databrowse, url): 

  • django/trunk/django/contrib/databrowse/templates/databrowse/calendar_day.html

    r5011 r5764  
    1111<ul class="objectlist"> 
    1212{% for object in object_list %} 
    13 <li class="{% cycle odd,even %}"><a href="{{ object.url }}">{{ object }}</a></li> 
     13<li class="{% cycle odd,even %}"><a href="{{ object.url }}">{{ object|escape }}</a></li> 
    1414{% endfor %} 
    1515</ul> 

  • django/trunk/django/contrib/databrowse/templates/databrowse/calendar_month.html

    r5011 r5764  
    1111<ul class="objectlist"> 
    1212{% for object in object_list %} 
    13 <li class="{% cycle odd,even %}"><a href="{{ object.url }}">{{ object }}</a></li> 
     13<li class="{% cycle odd,even %}"><a href="{{ object.url }}">{{ object|escape }}</a></li> 
    1414{% endfor %} 
    1515</ul> 

  • django/trunk/django/contrib/databrowse/templates/databrowse/choice_detail.html

    r5011 r5764  
    1111<ul class="objectlist"> 
    1212{% for object in object_list %} 
    13 <li class="{% cycle odd,even %}"><a href="{{ object.url }}">{{ object }}</a></li> 
     13<li class="{% cycle odd,even %}"><a href="{{ object.url }}">{{ object|escape }}</a></li> 
    1414{% endfor %} 
    1515</ul> 

  • django/trunk/django/contrib/databrowse/templates/databrowse/choice_list.html

    r5011 r5764  
    1111<ul class="objectlist"> 
    1212{% for choice in field.choices %} 
    13 <li class="{% cycle odd,even %}"><a href="{{ choice.url }}">{{ choice.label }}</a></li> 
     13<li class="{% cycle odd,even %}"><a href="{{ choice.url }}">{{ choice.label|escape }}</a></li> 
    1414{% endfor %} 
    1515</ul> 

  • django/trunk/django/contrib/databrowse/templates/databrowse/homepage.html

    r5011 r5764  
    1212                <p> 
    1313                {% for object in model.sample_objects %} 
    14                         <a href="{{ object.url }}">{{ object }}</a>,  
     14                        <a href="{{ object.url }}">{{ object|escape }}</a>,  
    1515                {% endfor %} 
    1616                        <a class="more" href="{{ model.url }}">More &rarr;</a> 

  • django/trunk/django/contrib/databrowse/templates/databrowse/model_detail.html

    r5011 r5764  
    1313<ul class="objectlist"> 
    1414{% for object in model.objects %} 
    15     <li class="{% cycle odd,even %}"><a href="{{ object.url }}">{{ object }}</a></li> 
     15    <li class="{% cycle odd,even %}"><a href="{{ object.url }}">{{ object|escape }}</a></li> 
    1616{% endfor %} 
    1717</ul> 

  • django/trunk/django/contrib/databrowse/templates/databrowse/object_detail.html

    r5497 r5764  
    55{% block content %} 
    66 
    7 <div id="breadcrumbs"><a href="{{ root_url }}">Home</a> / <a href="{{ object.model.url }}">{{ object.model.verbose_name_plural|capfirst }}</a> / {{ object }}</div> 
     7<div id="breadcrumbs"><a href="{{ root_url }}">Home</a> / <a href="{{ object.model.url }}">{{ object.model.verbose_name_plural|capfirst }}</a> / {{ object|escape }}</div> 
    88 
    9 <h1>{{ object.model.verbose_name|capfirst }}: {{ object }}</h1> 
     9<h1>{{ object.model.verbose_name|capfirst }}: {{ object|escape }}</h1> 
    1010 
    1111<table class="objectinfo"> 
    …… 
    1515<td> 
    1616{% if field.urls %} 
    17 {% for urlvalue in field.urls %} 
    18 {% if urlvalue.1 %}<a href="{{ urlvalue.1 }}">{% endif %}{{ urlvalue.0 }}{% if urlvalue.1 %}</a>{% endif %}{% if not forloop.last %}, {% endif %} 
     17{% for value, url in field.urls %} 
     18{% if url %}<a href="{{ url }}">{% endif %}{{ value|escape }}{% if url %}</a>{% endif %}{% if not forloop.last %}, {% endif %} 
    1919{% endfor %} 
    2020{% else %}None{% endif %} 
    …… 
    3030  <ul class="objectlist"> 
    3131    {% for object in related_object.object_list %} 
    32     <li class="{% cycle odd,even %}"><a href="{{ object.url }}">{{ object }}</a></li> 
     32    <li class="{% cycle odd,even %}"><a href="{{ object.url }}">{{ object|escape }}</a></li> 
    3333    {% endfor %} 
    3434  </ul>