Skip to content

Commit

Permalink
Now that formsets guarentee ordering (see [10623]) we can remove the …
Browse files Browse the repository at this point in the history
…arbitrary validation of this fact added as part of [10077].

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10628 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
jacobian committed Apr 22, 2009
1 parent 6d1837a commit d682978
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
4 changes: 0 additions & 4 deletions django/contrib/admin/validation.py
Expand Up @@ -67,10 +67,6 @@ def validate(cls, model):
# list_editable # list_editable
if hasattr(cls, 'list_editable') and cls.list_editable: if hasattr(cls, 'list_editable') and cls.list_editable:
check_isseq(cls, 'list_editable', 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): for idx, field_name in enumerate(cls.list_editable):
try: try:
field = opts.get_field_by_name(field_name)[0] field = opts.get_field_by_name(field_name)[0]
Expand Down
5 changes: 1 addition & 4 deletions docs/ref/contrib/admin/index.txt
Expand Up @@ -424,16 +424,13 @@ edit and save multiple rows at once.
``list_editable`` interacts with a couple of other options in particular ``list_editable`` interacts with a couple of other options in particular
ways; you should note the following rules: 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 * Any field in ``list_editable`` must also be in ``list_display``. You
can't edit a field that's not displayed! can't edit a field that's not displayed!


* The same field can't be listed in both ``list_editable`` and * 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. ``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 .. attribute:: ModelAdmin.list_filter


Expand Down

0 comments on commit d682978

Please sign in to comment.