Ticket #13659: pass_request_to_admin_display_callbacks.patch

django/contrib/admin/options.py

@@ -1081 +1081 @@
             'actions_on_top': self.actions_on_top,
             'actions_on_bottom': self.actions_on_bottom,
             'actions_selection_counter': self.actions_selection_counter,
+            'request': request,
         }
         context.update(extra_context or {})
         context_instance = template.RequestContext(request, current_app=self.admin_site.name)

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

@@ -92 +92 @@
 
       {% block result_list %}
           {% if action_form and actions_on_top and cl.full_result_count %}{% admin_actions %}{% endif %}
-          {% result_list cl %}
+          {% result_list request cl %}
           {% if action_form and actions_on_bottom and cl.full_result_count %}{% admin_actions %}{% endif %}
       {% endblock %}
       {% block pagination %}{% pagination cl %}{% endblock %}

django/contrib/admin/templatetags/admin_list.py

@@ -126 +126 @@
     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, form):
+def items_for_result(request, cl, result, form):
     """
     Generates the actual list of data.
     """
@@ -135 +135 @@
     for field_name in cl.list_display:
         row_class = ''
         try:
-            f, attr, value = lookup_field(field_name, result, cl.model_admin)
+            f, attr, value = lookup_field(field_name, result, cl.model_admin, request)
         except (AttributeError, ObjectDoesNotExist):
             result_repr = EMPTY_CHANGELIST_VALUE
         else:
@@ -192 +192 @@
     if form:
         yield mark_safe(u'<td>%s</td>' % force_unicode(form[cl.model._meta.pk.name]))
 
-def results(cl):
+def results(request, cl):
     if cl.formset:
         for res, form in zip(cl.result_list, cl.formset.forms):
-            yield list(items_for_result(cl, res, form))
+            yield list(items_for_result(request, cl, res, form))
     else:
         for res in cl.result_list:
-            yield list(items_for_result(cl, res, None))
+            yield list(items_for_result(request, cl, res, None))
 
-def result_list(cl):
+def result_list(request, cl):
     """
     Displays the headers and data list together
     """
     return {'cl': cl,
             'result_headers': list(result_headers(cl)),
-            'results': list(results(cl))}
+            'results': list(results(request, cl))}
 result_list = register.inclusion_tag("admin/change_list_results.html")(result_list)
 
 def date_hierarchy(cl):

django/contrib/admin/util.py

@@ -250 +250 @@
     singular, plural = d["verbose_name"], d["verbose_name_plural"]
     return ungettext(singular, plural, n or 0)
 
-def lookup_field(name, obj, model_admin=None):
+def lookup_field(name, obj, model_admin=None, request=None):
     opts = obj._meta
     try:
         f = opts.get_field(name)
@@ -258 +258 @@
         # For non-field values, the value is either a method, property or
         # returned via a callable.
         if callable(name):
-            attr = name
-            value = attr(obj)
+            attr = func = name
         elif (model_admin is not None and hasattr(model_admin, name) and
           not name == '__str__' and not name == '__unicode__'):
-            attr = getattr(model_admin, name)
-            value = attr(obj)
+            attr = func = getattr(model_admin, name)
         else:
             attr = getattr(obj, name)
             if callable(attr):
-                value = attr()
+                func = getattr(obj.__class__, name)
             else:
-                value = attr
+                def func(*args): return attr
+
+        if getattr(attr, 'accepts_request', False):
+            value = func(obj, request)
+        else:
+            value = func(obj)
+
         f = None
     else:
         attr = None

tests/regressiontests/admin_changelist/tests.py

@@ -31 +31 @@
                 m.list_select_related, m.list_per_page, m.list_editable, m)
         FormSet = m.get_changelist_formset(request)
         cl.formset = FormSet(queryset=cl.result_list)
-        template = Template('{% load admin_list %}{% spaceless %}{% result_list cl %}{% endspaceless %}')
-        context = Context({'cl': cl})
+        template = Template('{% load admin_list %}{% spaceless %}{% result_list request cl %}{% endspaceless %}')
+        context = Context({'request': request, 'cl': cl})
         table_output = template.render(context)
         hidden_input_elem = '<input type="hidden" name="form-0-id" value="1" id="id_form-0-id" />' 
         self.failIf(table_output.find(hidden_input_elem) == -1,
@@ -49 +49 @@
                 m.list_select_related, m.list_per_page, m.list_editable, m)
         FormSet = m.get_changelist_formset(request)
         cl.formset = FormSet(queryset=cl.result_list)
-        template = Template('{% load admin_list %}{% spaceless %}{% result_list cl %}{% endspaceless %}')
-        context = Context({'cl': cl})
+        template = Template('{% load admin_list %}{% spaceless %}{% result_list request cl %}{% endspaceless %}')
+        context = Context({'request': request, 'cl': cl})
         table_output = template.render(context)
         self.failIf(table_output.find(hidden_input_elem) == -1,
             'Failed to find expected hidden input element in: %s' % table_output)

tests/regressiontests/admin_util/tests.py

@@ -83 +83 @@
             def get_admin_value(self, obj):
                 return ADMIN_METHOD
 
+        class MockRequest(object):
+            pass
+
         simple_function = lambda obj: SIMPLE_FUNCTION
 
+        request_function = lambda obj, req: repr(req)
+        request_function.accepts_request = True
+
+        request = MockRequest()
+
         article = Article(
             site=Site(domain=SITE_NAME),
             title=TITLE_TEXT,
@@ -98 +106 @@
             ('title', TITLE_TEXT),
             ('get_admin_value', ADMIN_METHOD),
             (simple_function, SIMPLE_FUNCTION),
+            (request_function, repr(request)),
             ('test_from_model', article.test_from_model()),
             ('non_field', INSTANCE_ATTRIBUTE)
         )
 
         mock_admin = MockModelAdmin()
         for name, value in verifications:
-            field, attr, resolved_value = lookup_field(name, article, mock_admin)
+            field, attr, resolved_value = lookup_field(name, article, mock_admin, request)
 
             if field is not None:
                 resolved_value = display_for_field(resolved_value, field)