Ticket #13038: bug13038.patch

django/contrib/admin/helpers.py

@@ -128 +128 @@
 
 class AdminReadonlyField(object):
     def __init__(self, form, field, is_first, model_admin=None):
-        self.field = field
+        self.field_name = field
         self.form = form
         self.model_admin = model_admin
         self.is_first = is_first
@@ -140 +140 @@
         if not self.is_first:
             attrs["class"] = "inline"
         name = forms.forms.pretty_name(
-            label_for_field(self.field, self.model_admin.model, self.model_admin)
+            label_for_field(self.field_name, self.model_admin.model, self.model_admin)
         )
         contents = force_unicode(escape(name)) + u":"
         return mark_safe('<label%(attrs)s>%(contents)s</label>' % {
@@ -151 +151 @@
     def contents(self):
         from django.contrib.admin.templatetags.admin_list import _boolean_icon
         from django.contrib.admin.views.main import EMPTY_CHANGELIST_VALUE
-        field, obj, model_admin = self.field, self.form.instance, self.model_admin
+        field, obj, model_admin = self.field_name, self.form.instance, self.model_admin
         try:
             f, attr, value = lookup_field(field, obj, model_admin)
         except (AttributeError, ObjectDoesNotExist):
@@ -323 +323 @@
             del data_dict[key]
             data_dict[str(key)] = value
     return data_dict
-

django/contrib/admin/templates/admin/includes/fieldset.html

@@ -4 +4 @@
         <div class="description">{{ fieldset.description|safe }}</div>
     {% endif %}
     {% for line in fieldset %}
-        <div class="form-row{% if line.errors %} errors{% endif %} {% for field in line %}{{ field.field.name }} {% endfor %} ">
+        <div class="form-row{% if line.errors %} errors{% endif %}{% for field in line %} {% if field.is_readonly %}{{ field.field_name }}{% else %}{{ field.field.name }}{% endif %}{% endfor %}">
             {{ line.errors }}
             {% for field in line %}
                 <div{% if not line.fields|length_is:"1" %} class="field-box"{% endif %}>

tests/regressiontests/admin_views/tests.py

@@ -1944 +1944 @@
             formats.localize(datetime.date.today() - datetime.timedelta(days=7))
         )
 
+        self.assertContains(response, '<div class="form-row coolness">')
+        self.assertContains(response, '<div class="form-row awesomeness_level">')
+        self.assertContains(response, '<div class="form-row posted">')
+        self.assertContains(response, '<div class="form-row ">')
+
         p = Post.objects.create(title="I worked on readonly_fields", content="Its good stuff")
         response = self.client.get('/test_admin/admin/admin_views/post/%d/' % p.pk)
         self.assertContains(response, "%d amount of cool" % p.pk)