Ticket #289: 289_error_list.2.diff

django/contrib/admin/templatetags/admin_modify.py

@@ -245 +245 @@
         'class_names': " ".join(class_names),
     }
 admin_field_line = register.inclusion_tag('admin/field_line.html', takes_context=True)(admin_field_line)
+
+def error_list(fields, error_dict):
+    errors = []
+    for err_field_name, err_messages in error_dict.items():
+        error = {}
+        for field in fields:
+            if field.name == err_field_name:
+                error['verbose_name'] = capfirst(field.verbose_name)
+                error['messages'] = err_messages
+            elif isinstance(field, models.fields.DateTimeField):
+                parts = err_field_name.split("_")
+                if parts[-1] in ["date", "time"] and '_'.join(parts[:-1]) == field.name:
+                    error['verbose_name'] = capfirst("%s (%s)" % (field.verbose_name, parts[-1]))
+                    error['messages'] = err_messages
+        if not error:
+            raise RuntimeError, "verbose field name error not found for: %s" % err_field_name
+        errors.append(error)
+    return {'error_list': errors}
+error_list = register.inclusion_tag('admin/error_list.html')(error_list)

django/contrib/admin/templates/admin/error_list.html

@@ +1 @@
+{% load admin_modify %}
+<div class="error-list">
+    <dl>
+        {% for error in error_list %}
+            <dt>{{ error.verbose_name }}</dt>
+                {% for message in error.messages %}
+                    <dd>{{ message }}</dd>
+                {% endfor %}
+        {% endfor %}
+    </dl>
+</div>

django/contrib/admin/templates/admin/change_form.html

@@ -31 +31 @@
     <p class="errornote">
     {% blocktrans count form.error_dict.items|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}
     </p>
+    {% error_list opts.fields form.error_dict %}
 {% endif %}
 {% for bound_field_set in bound_field_sets %}
    <fieldset class="module aligned {{ bound_field_set.classes }}">