mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-30 00:56:09 +00:00
Code Issues 32 Releases Wiki Activity

newforms-admin: Moved ordering from AdminOptions to ModelAdmin.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@4337 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty
2007-01-16 00:57:56 +00:00
parent f72a100b53
commit 052363fb8b
4 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
django/contrib/admin/options.py
View File

@@ -41,6 +41,7 @@ class ModelAdmin(object):
search_fields = () search_fields = ()
date_hierarchy = None date_hierarchy = None
save_as = False save_as = False
ordering = None
def __init__(self, model): def __init__(self, model):
self.model = model self.model = model

2
django/contrib/admin/views/main.py
View File

@@ -398,7 +398,7 @@ class ChangeList(object):
# then check the object's default ordering. If neither of those exist, # then check the object's default ordering. If neither of those exist,
# order descending by ID by default. Finally, look for manually-specified # order descending by ID by default. Finally, look for manually-specified
# ordering from the query string. # 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. # Normalize it to new-style ordering.
ordering = handle_legacy_orderlist(ordering) ordering = handle_legacy_orderlist(ordering)

2
django/db/models/base.py
View File

@@ -137,7 +137,7 @@ class Model(object):
# of ModelAdmin. # of ModelAdmin.
cls._meta.ModelAdmin = type('ModelAdmin', (value, ModelAdmin), {}) cls._meta.ModelAdmin = type('ModelAdmin', (value, ModelAdmin), {})
# This AdminOptions stuff is legacy and will eventually be removed. # 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) value.contribute_to_class(cls, name)
elif hasattr(value, 'contribute_to_class'): elif hasattr(value, 'contribute_to_class'):
value.contribute_to_class(cls, name) value.contribute_to_class(cls, name)

2
django/db/models/options.py
View File

@@ -200,11 +200,9 @@ class Options(object):
class AdminOptions(object): class AdminOptions(object):
def __init__(self, fields=None, js=None, def __init__(self, fields=None, js=None,
ordering=None,
save_on_top=False, manager=None): save_on_top=False, manager=None):
self.fields = fields self.fields = fields
self.js = js or [] self.js = js or []
self.ordering = ordering
self.save_on_top = save_on_top self.save_on_top = save_on_top
self.manager = manager or Manager() self.manager = manager or Manager()