Ticket #6396: ticket_6396.patch

django/contrib/admin/options.py

@@ -627 +627 @@
             'title': cl.title,
             'is_popup': cl.is_popup,
             'cl': cl,
+            'result_headers': list(cl.result_headers()),
+            'results': list(cl.results()),
         })
         c.update({'has_add_permission': self.has_add_permission(request)}),
         return render_to_response(['admin/%s/%s/change_list.html' % (app_label, opts.object_name.lower()),

django/contrib/admin/templates/admin/change_list.html

@@ -33 +33 @@
 {% endif %}
 {% endblock %}
 
-{% block result_list %}{% result_list cl %}{% endblock %}
+{% block result_list %}
+{% if results %}
+<table cellspacing="0">
+<thead>
+<tr>
+{% for header in result_headers %}<th{{ header.class_attrib }}>
+{% if header.sortable %}<a href="{{ header.url }}">{% endif %}
+{{ header.text|capfirst }}
+{% if header.sortable %}</a>{% endif %}</th>{% endfor %}
+</tr>
+</thead>
+<tbody>
+{% for result in results %}
+<tr class="{% cycle 'row1' 'row2' %}">{% for item in result %}{{ item }}{% endfor %}</tr>
+{% endfor %}
+</tbody>
+</table>
+{% endif %}
+{% endblock %}
+
 {% block pagination %}{% pagination cl %}{% endblock %}
 </div>
 </div>

deleted file django/contrib/admin/templates/admin/change_list_results.html

@@ -1 @@
-{% if results %}
-<table cellspacing="0">
-<thead>
-<tr>
-{% for header in result_headers %}<th{{ header.class_attrib }}>
-{% if header.sortable %}<a href="{{ header.url }}">{% endif %}
-{{ header.text|capfirst }}
-{% if header.sortable %}</a>{% endif %}</th>{% endfor %}
-</tr>
-</thead>
-<tbody>
-{% for result in results %}
-<tr class="{% cycle 'row1' 'row2' %}">{% for item in result %}{{ item }}{% endfor %}</tr>
-{% endfor %}
-</tbody>
-</table>
-{% endif %}

django/contrib/admin/templatetags/admin_list.py

@@ -1 +1 @@
 from django.conf import settings
 from django.contrib.admin.views.main import ALL_VAR, EMPTY_CHANGELIST_VALUE
 from django.contrib.admin.views.main import ORDER_VAR, ORDER_TYPE_VAR, PAGE_VAR, SEARCH_VAR
-from django.core.exceptions import ObjectDoesNotExist
 from django.db import models
 from django.utils import dateformat
-from django.utils.html import escape, conditional_escape
-from django.utils.text import capfirst
 from django.utils.safestring import mark_safe
 from django.utils.translation import get_date_formats, get_partial_date_formats, ugettext as _
-from django.utils.encoding import smart_unicode, smart_str, force_unicode
 from django.template import Library
 import datetime
 
@@ -68 +64 @@
     }
 pagination = register.inclusion_tag('admin/pagination.html')(pagination)
 
-def result_headers(cl):
-    lookup_opts = cl.lookup_opts
-
-    for i, field_name in enumerate(cl.list_display):
-        try:
-            f = lookup_opts.get_field(field_name)
-            admin_order_field = None
-        except models.FieldDoesNotExist:
-            # For non-field list_display values, check for the function
-            # attribute "short_description". If that doesn't exist, fall back
-            # to the method name. And __str__ and __unicode__ are special-cases.
-            if field_name == '__unicode__':
-                header = force_unicode(lookup_opts.verbose_name)
-            elif field_name == '__str__':
-                header = smart_str(lookup_opts.verbose_name)
-            else:
-                attr = getattr(cl.model, field_name) # Let AttributeErrors propagate.
-                try:
-                    header = attr.short_description
-                except AttributeError:
-                    header = field_name.replace('_', ' ')
-
-            # It is a non-field, but perhaps one that is sortable
-            admin_order_field = getattr(getattr(cl.model, field_name), "admin_order_field", None)
-            if not admin_order_field:
-                yield {"text": header}
-                continue
-
-            # So this _is_ a sortable non-field.  Go to the yield
-            # after the else clause.
-        else:
-            if isinstance(f.rel, models.ManyToOneRel) and f.null:
-                yield {"text": f.verbose_name}
-                continue
-            else:
-                header = f.verbose_name
-
-        th_classes = []
-        new_order_type = 'asc'
-        if field_name == cl.order_field or admin_order_field == cl.order_field:
-            th_classes.append('sorted %sending' % cl.order_type.lower())
-            new_order_type = {'asc': 'desc', 'desc': 'asc'}[cl.order_type.lower()]
-
-        yield {"text": header,
-               "sortable": True,
-               "url": cl.get_query_string({ORDER_VAR: i, ORDER_TYPE_VAR: new_order_type}),
-               "class_attrib": mark_safe(th_classes and ' class="%s"' % ' '.join(th_classes) or '')}
-
 def _boolean_icon(field_val):
     BOOLEAN_MAPPING = {True: 'yes', False: 'no', None: 'unknown'}
     return mark_safe(u'<img src="%simg/admin/icon-%s.gif" alt="%s" />' % (settings.ADMIN_MEDIA_PREFIX, BOOLEAN_MAPPING[field_val], field_val))
-
-def items_for_result(cl, result):
-    first = True
-    pk = cl.lookup_opts.pk.attname
-    for field_name in cl.list_display:
-        row_class = ''
-        try:
-            f = cl.lookup_opts.get_field(field_name)
-        except models.FieldDoesNotExist:
-            # For non-field list_display values, the value is either a method
-            # or a property.
-            try:
-                attr = getattr(result, field_name)
-                allow_tags = getattr(attr, 'allow_tags', False)
-                boolean = getattr(attr, 'boolean', False)
-                if callable(attr):
-                    attr = attr()
-                if boolean:
-                    allow_tags = True
-                    result_repr = _boolean_icon(attr)
-                else:
-                    result_repr = smart_unicode(attr)
-            except (AttributeError, ObjectDoesNotExist):
-                result_repr = EMPTY_CHANGELIST_VALUE
-            else:
-                # Strip HTML tags in the resulting text, except if the
-                # function has an "allow_tags" attribute set to True.
-                if not allow_tags:
-                    result_repr = escape(result_repr)
-        else:
-            field_val = getattr(result, f.attname)
-
-            if isinstance(f.rel, models.ManyToOneRel):
-                if field_val is not None:
-                    result_repr = escape(getattr(result, f.name))
-                else:
-                    result_repr = EMPTY_CHANGELIST_VALUE
-            # Dates and times are special: They're formatted in a certain way.
-            elif isinstance(f, models.DateField) or isinstance(f, models.TimeField):
-                if field_val:
-                    (date_format, datetime_format, time_format) = get_date_formats()
-                    if isinstance(f, models.DateTimeField):
-                        result_repr = capfirst(dateformat.format(field_val, datetime_format))
-                    elif isinstance(f, models.TimeField):
-                        result_repr = capfirst(dateformat.time_format(field_val, time_format))
-                    else:
-                        result_repr = capfirst(dateformat.format(field_val, date_format))
-                else:
-                    result_repr = EMPTY_CHANGELIST_VALUE
-                row_class = ' class="nowrap"'
-            # Booleans are special: We use images.
-            elif isinstance(f, models.BooleanField) or isinstance(f, models.NullBooleanField):
-                result_repr = _boolean_icon(field_val)
-            # DecimalFields are special: Zero-pad the decimals.
-            elif isinstance(f, models.DecimalField):
-                if field_val is not None:
-                    result_repr = ('%%.%sf' % f.decimal_places) % field_val
-                else:
-                    result_repr = EMPTY_CHANGELIST_VALUE
-            # Fields with choices are special: Use the representation
-            # of the choice.
-            elif f.choices:
-                result_repr = dict(f.choices).get(field_val, EMPTY_CHANGELIST_VALUE)
-            else:
-                result_repr = escape(field_val)
-        if force_unicode(result_repr) == '':
-            result_repr = mark_safe('&nbsp;')
-        # If list_display_links not defined, add the link tag to the first field
-        if (first and not cl.list_display_links) or field_name in cl.list_display_links:
-            table_tag = {True:'th', False:'td'}[first]
-            first = False
-            url = cl.url_for_result(result)
-            # 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))
-        else:
-            yield mark_safe(u'<td%s>%s</td>' % (row_class, conditional_escape(result_repr)))
-
-def results(cl):
-    for res in cl.result_list:
-        yield list(items_for_result(cl,res))
-
-def result_list(cl):
-    return {'cl': cl,
-            'result_headers': list(result_headers(cl)),
-            'results': list(results(cl))}
-result_list = register.inclusion_tag("admin/change_list_results.html")(result_list)
 
 def date_hierarchy(cl):
     if cl.date_hierarchy:

django/contrib/admin/views/main.py

@@ -2 +2 @@
 from django.contrib.admin.filterspecs import FilterSpec
 from django.contrib.admin.options import IncorrectLookupParameters
 from django.contrib.admin.views.decorators import staff_member_required
+from django.core.exceptions import ObjectDoesNotExist
+from django.utils.html import escape, conditional_escape
+from django.utils.text import capfirst
+from django.utils import dateformat
 from django.views.decorators.cache import never_cache
 from django.core.paginator import ObjectPaginator, InvalidPage
 from django.shortcuts import render_to_response
 from django.db import models
 from django.db.models.query import handle_legacy_orderlist, QuerySet
 from django.http import Http404
-from django.utils.encoding import force_unicode, smart_str
+from django.utils.encoding import force_unicode, smart_str, smart_unicode
 from django.utils.translation import ugettext
 from django.utils.safestring import mark_safe
 import operator
@@ -342 +346 @@
 
     def url_for_result(self, result):
         return "%s/" % quote(getattr(result, self.pk_attname))
+
+    def result_headers(self):
+        lookup_opts = self.lookup_opts
+
+        for i, field_name in enumerate(self.list_display):
+            try:
+                f = lookup_opts.get_field(field_name)
+                admin_order_field = None
+            except models.FieldDoesNotExist:
+                # For non-field list_display values, check for the function
+                # attribute "short_description". If that doesn't exist, fall back
+                # to the method name. And __str__ and __unicode__ are special-cases.
+                if field_name == '__unicode__':
+                    header = force_unicode(lookup_opts.verbose_name)
+                elif field_name == '__str__':
+                    header = smart_str(lookup_opts.verbose_name)
+                else:
+                    attr = getattr(self.model, field_name) # Let AttributeErrors propagate.
+                    try:
+                        header = attr.short_description
+                    except AttributeError:
+                        header = field_name.replace('_', ' ')
+
+                # It is a non-field, but perhaps one that is sortable
+                admin_order_field = getattr(getattr(self.model, field_name), "admin_order_field", None)
+                if not admin_order_field:
+                    yield {"text": header}
+                    continue
+
+                # So this _is_ a sortable non-field.  Go to the yield
+                # after the else clause.
+            else:
+                if isinstance(f.rel, models.ManyToOneRel) and f.null:
+                    yield {"text": f.verbose_name}
+                    continue
+                else:
+                    header = f.verbose_name
+
+            th_classes = []
+            new_order_type = 'asc'
+            if field_name == self.order_field or admin_order_field == self.order_field:
+                th_classes.append('sorted %sending' % self.order_type.lower())
+                new_order_type = {'asc': 'desc', 'desc': 'asc'}[self.order_type.lower()]
+
+            yield {"text": header,
+                   "sortable": True,
+                   "url": self.get_query_string({ORDER_VAR: i, ORDER_TYPE_VAR: new_order_type}),
+                   "class_attrib": mark_safe(th_classes and ' class="%s"' % ' '.join(th_classes) or '')}
+
+    def items_for_result(self, result):
+        first = True
+        pk = self.lookup_opts.pk.attname
+        for field_name in self.list_display:
+            row_class = ''
+            try:
+                f = self.lookup_opts.get_field(field_name)
+            except models.FieldDoesNotExist:
+                # For non-field list_display values, the value is either a method
+                # or a property.
+                try:
+                    attr = getattr(result, field_name)
+                    allow_tags = getattr(attr, 'allow_tags', False)
+                    boolean = getattr(attr, 'boolean', False)
+                    if callable(attr):
+                        attr = attr()
+                    if boolean:
+                        allow_tags = True
+                        result_repr = _boolean_icon(attr)
+                    else:
+                        result_repr = smart_unicode(attr)
+                except (AttributeError, ObjectDoesNotExist):
+                    result_repr = EMPTY_CHANGELIST_VALUE
+                else:
+                    # Strip HTML tags in the resulting text, except if the
+                    # function has an "allow_tags" attribute set to True.
+                    if not allow_tags:
+                        result_repr = escape(result_repr)
+            else:
+                field_val = getattr(result, f.attname)
+
+                if isinstance(f.rel, models.ManyToOneRel):
+                    if field_val is not None:
+                        result_repr = escape(getattr(result, f.name))
+                    else:
+                        result_repr = EMPTY_CHANGELIST_VALUE
+                # Dates and times are special: They're formatted in a certain way.
+                elif isinstance(f, models.DateField) or isinstance(f, models.TimeField):
+                    if field_val:
+                        (date_format, datetime_format, time_format) = get_date_formats()
+                        if isinstance(f, models.DateTimeField):
+                            result_repr = capfirst(dateformat.format(field_val, datetime_format))
+                        elif isinstance(f, models.TimeField):
+                            result_repr = capfirst(dateformat.time_format(field_val, time_format))
+                        else:
+                            result_repr = capfirst(dateformat.format(field_val, date_format))
+                    else:
+                        result_repr = EMPTY_CHANGELIST_VALUE
+                    row_class = ' class="nowrap"'
+                # Booleans are special: We use images.
+                elif isinstance(f, models.BooleanField) or isinstance(f, models.NullBooleanField):
+                    result_repr = _boolean_icon(field_val)
+                # DecimalFields are special: Zero-pad the decimals.
+                elif isinstance(f, models.DecimalField):
+                    if field_val is not None:
+                        result_repr = ('%%.%sf' % f.decimal_places) % field_val
+                    else:
+                        result_repr = EMPTY_CHANGELIST_VALUE
+                # Fields with choices are special: Use the representation
+                # of the choice.
+                elif f.choices:
+                    result_repr = dict(f.choices).get(field_val, EMPTY_CHANGELIST_VALUE)
+                else:
+                    result_repr = escape(field_val)
+            if force_unicode(result_repr) == '':
+                result_repr = mark_safe(' ')
+            # If list_display_links not defined, add the link tag to the first field
+            if (first and not self.list_display_links) or field_name in self.list_display_links:
+                table_tag = {True:'th', False:'td'}[first]
+                first = False
+                url = self.url_for_result(result)
+                # 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, (self.is_popup and ' onclick="opener.dismissRelatedLookupPopup(window, %s); return false;"' % result_id or ''), conditional_escape(result_repr), table_tag))
+            else:
+                yield mark_safe(u'<td%s>%s</td>' % (row_class, conditional_escape(result_repr)))
+
+    def results(self):
+        for res in self.result_list:
+            yield list(self.items_for_result(res))
+