Ticket #6396: better_patch-6396.diff

Users/mwdiers/Documents/workspace/django-trunk/django/contrib/admin/templates/admin/change_list_results.html

@@ -10 +10 @@
 </thead>
 <tbody>
 {% for result in results %}
-<tr class="{% cycle 'row1' 'row2' %}">{% for item in result %}{{ item }}{% endfor %}</tr>
+<tr class="{% cycle 'row1' 'row2' %}">
+{% for item in result %}<{{ item.table_tag }} {{ item.row_class }}>{% if item.url %}<a href="{{ item.url }}" {{ item.event }}>{{ item.result }}</a>{% else %}{{ item.result }}{% endif %}</{{ item.table_tag }}>{% endfor %}
+</tr>
 {% endfor %}
 </tbody>
 </table>

Users/mwdiers/Documents/workspace/django-trunk/django/contrib/admin/templatetags/admin_list.py

@@ -196 +196 @@
             # Convert the pk to something that can be used in Javascript.
             # Problem cases are long ints (23L) and non-ASCII strings.
             result_id = repr(force_unicode(getattr(result, pk)))[1:]
-            yield mark_safe(u'<%s%s><a href="%s"%s>%s</a></%s>' % \
-                (table_tag, row_class, url, (cl.is_popup and ' onclick="opener.dismissRelatedLookupPopup(window, %s); return false;"' % result_id or ''), conditional_escape(result_repr), table_tag))
+            yield {'row_class': row_class, 'url': url, 'event': (cl.is_popup and ' onclick="opener.dismissRelatedLookupPopup(window, %s); return false;"' % result_id or ''), 'result': conditional_escape(result_repr), 'table_tag': table_tag}               
         else:
-            yield mark_safe(u'<td%s>%s</td>' % (row_class, conditional_escape(result_repr)))
+            yield {'row_class': row_class, 'url': '', 'event': '', 'result': conditional_escape(result_repr), 'table_tag': 'td'}               
 
 def results(cl):
     for res in cl.result_list: