Author: jacob
Date: 2009-04-22 17:45:23 -0500 (Wed, 22 Apr 2009)
New Revision: 10628

Modified:
   django/trunk/django/contrib/admin/validation.py
   django/trunk/docs/ref/contrib/admin/index.txt
Log:
Now that formsets guarentee ordering (see [10623]) we can remove the arbitrary 
validation of this fact added as part of [10077].

Modified: django/trunk/django/contrib/admin/validation.py
===================================================================
--- django/trunk/django/contrib/admin/validation.py     2009-04-22 22:41:18 UTC 
(rev 10627)
+++ django/trunk/django/contrib/admin/validation.py     2009-04-22 22:45:23 UTC 
(rev 10628)
@@ -67,10 +67,6 @@
     # list_editable
     if hasattr(cls, 'list_editable') and cls.list_editable:
         check_isseq(cls, 'list_editable', cls.list_editable)
-        if not (opts.ordering or cls.ordering):
-            raise ImproperlyConfigured("'%s.list_editable' cannot be used "
-                "without a default ordering. Please define ordering on either 
%s or %s."
-                % (cls.__name__, cls.__name__, model.__name__))
         for idx, field_name in enumerate(cls.list_editable):
             try:
                 field = opts.get_field_by_name(field_name)[0]

Modified: django/trunk/docs/ref/contrib/admin/index.txt
===================================================================
--- django/trunk/docs/ref/contrib/admin/index.txt       2009-04-22 22:41:18 UTC 
(rev 10627)
+++ django/trunk/docs/ref/contrib/admin/index.txt       2009-04-22 22:45:23 UTC 
(rev 10628)
@@ -424,16 +424,13 @@
     ``list_editable`` interacts with a couple of other options in particular
     ways; you should note the following rules:
 
-        * To use ``list_editable`` you must have defined ``ordering`` on either
-          your model's or your ``ModelAdmin``'s inner ``Meta``.
-
         * Any field in ``list_editable`` must also be in ``list_display``. You
           can't edit a field that's not displayed!
 
         * The same field can't be listed in both ``list_editable`` and
           ``list_display_links`` -- a field can't be both a form and a link.
 
-    You'll get a validation error if any of these rules are broken.
+    You'll get a validation error if either of these rules are broken.
 
 .. attribute:: ModelAdmin.list_filter
 


--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to 
[email protected]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to