diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2007-01-16 00:57:56 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2007-01-16 00:57:56 +0000 |
| commit | 052363fb8b2532d4137858aff9073d6cdce8baee (patch) | |
| tree | 00db8371de30475640e904b1b26b46af800a1b4c | |
| parent | f72a100b531f680cf5595412c82827d81f8b2c29 (diff) | |
newforms-admin: Moved ordering from AdminOptions to ModelAdmin.
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@4337 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/admin/options.py | 1 | ||||
| -rw-r--r-- | django/contrib/admin/views/main.py | 2 | ||||
| -rw-r--r-- | django/db/models/base.py | 2 | ||||
| -rw-r--r-- | django/db/models/options.py | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index ca23c0ef20..d5e7dfcd66 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -41,6 +41,7 @@ class ModelAdmin(object): search_fields = () date_hierarchy = None save_as = False + ordering = None def __init__(self, model): self.model = model diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py index a4e2e0dac2..3a686b0f07 100644 --- a/django/contrib/admin/views/main.py +++ b/django/contrib/admin/views/main.py @@ -398,7 +398,7 @@ class ChangeList(object): # then check the object's default ordering. If neither of those exist, # order descending by ID by default. Finally, look for manually-specified # ordering from the query string. - ordering = lookup_opts.admin.ordering or lookup_opts.ordering or ['-' + lookup_opts.pk.name] + ordering = lookup_opts.ModelAdmin.ordering or lookup_opts.ordering or ['-' + lookup_opts.pk.name] # Normalize it to new-style ordering. ordering = handle_legacy_orderlist(ordering) diff --git a/django/db/models/base.py b/django/db/models/base.py index ecd3cd4f71..5d3c5220cc 100644 --- a/django/db/models/base.py +++ b/django/db/models/base.py @@ -137,7 +137,7 @@ class Model(object): # of ModelAdmin. cls._meta.ModelAdmin = type('ModelAdmin', (value, ModelAdmin), {}) # This AdminOptions stuff is legacy and will eventually be removed. - value = AdminOptions(**dict([(k, v) for k, v in value.__dict__.items() if not k.startswith('_') and k not in ('list_display', 'list_display_links', 'list_filter', 'date_hierarchy', 'save_as', 'search_fields', 'list_select_related', 'list_per_page')])) + value = AdminOptions(**dict([(k, v) for k, v in value.__dict__.items() if not k.startswith('_') and k not in ('list_display', 'list_display_links', 'list_filter', 'date_hierarchy', 'save_as', 'search_fields', 'list_select_related', 'list_per_page', 'ordering')])) value.contribute_to_class(cls, name) elif hasattr(value, 'contribute_to_class'): value.contribute_to_class(cls, name) diff --git a/django/db/models/options.py b/django/db/models/options.py index 77d656d36e..86056a66fd 100644 --- a/django/db/models/options.py +++ b/django/db/models/options.py @@ -200,11 +200,9 @@ class Options(object): class AdminOptions(object): def __init__(self, fields=None, js=None, - ordering=None, save_on_top=False, manager=None): self.fields = fields self.js = js or [] - self.ordering = ordering self.save_on_top = save_on_top self.manager = manager or Manager() |