Changeset 7878

Timestamp:

07/10/08 15:24:46 (5 months ago)

Author:

brosner

Message:

newforms-admin: Fixed #5628 -- When inlines have validation errors an error message is now displayed at the top of the page. Thanks Petr Marhoun for the improved patch.

Files:

• django/branches/newforms-admin/django/contrib/admin/options.py (modified) (3 diffs)
• django/branches/newforms-admin/django/contrib/admin/templates/admin/change_form.html (modified) (1 diff)

django/branches/newforms-admin/django/contrib/admin/options.py

@@ -540 +540 @@
-            'media': mark_safe(media),
-            'inline_admin_formsets': inline_admin_formsets,
+            'errors': AdminErrorList(form, inline_formsets),
-            'root_path': self.admin_site.root_path,
-        }
@@ -617 +618 @@
-            'media': mark_safe(media),
-            'inline_admin_formsets': inline_admin_formsets,
+            'errors': AdminErrorList(form, inline_formsets),
-            'root_path': self.admin_site.root_path,
-        }
@@ -825 +827 @@
-        from django.newforms.formsets import ORDERING_FIELD_NAME
-        return AdminField(self.form, ORDERING_FIELD_NAME, False)
+
+class AdminErrorList(forms.util.ErrorList):
+    """
+    Stores all errors for the form/formsets in an add/change stage view.
+    """
+    def __init__(self, form, inline_formsets):
+        if form.is_bound:
+            self.extend(form.errors.values())
+            for inline_formset in inline_formsets:
+                self.extend(inline_formset.non_form_errors())
+                for errors_in_inline_form in inline_formset.errors:
+                    self.extend(errors_in_inline_form.values())

django/branches/newforms-admin/django/contrib/admin/templates/admin/change_form.html

@@ -33 +33 @@
-{% if is_popup %}<input type="hidden" name="_popup" value="1" />{% endif %}
-{% if save_on_top %}{% submit_row %}{% endif %}
-adminform.form.
+
-    <p class="errornote">
-adminform.form.
+
-    </p>
-    <ul class="errorlist">{% for error in adminform.form.non_field_errors %}<li>{{ error }}</li>{% endfor %}</ul>