Django

Code

Changeset 4337

Show
Ignore:
Timestamp:
01/15/07 18:57:56 (2 years ago)
Author:
adrian
Message:

newforms-admin: Moved ordering from AdminOptions? to ModelAdmin?.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r4336 r4337  
    4242    date_hierarchy = None 
    4343    save_as = False 
     44    ordering = None 
    4445 
    4546    def __init__(self, model): 

  • django/branches/newforms-admin/django/contrib/admin/views/main.py

    r4336 r4337  
    399399        # order descending by ID by default. Finally, look for manually-specified 
    400400        # ordering from the query string. 
    401         ordering = lookup_opts.admin.ordering or lookup_opts.ordering or ['-' + lookup_opts.pk.name] 
     401        ordering = lookup_opts.ModelAdmin.ordering or lookup_opts.ordering or ['-' + lookup_opts.pk.name] 
    402402 
    403403        # Normalize it to new-style ordering. 

  • django/branches/newforms-admin/django/db/models/base.py

    r4336 r4337  
    138138            cls._meta.ModelAdmin = type('ModelAdmin', (value, ModelAdmin), {}) 
    139139            # This AdminOptions stuff is legacy and will eventually be removed. 
    140             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')])) 
     140            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')])) 
    141141            value.contribute_to_class(cls, name) 
    142142        elif hasattr(value, 'contribute_to_class'): 

  • django/branches/newforms-admin/django/db/models/options.py

    r4336 r4337  
    201201class AdminOptions(object): 
    202202    def __init__(self, fields=None, js=None, 
    203         ordering=None, 
    204203        save_on_top=False, manager=None): 
    205204        self.fields = fields 
    206205        self.js = js or [] 
    207         self.ordering = ordering 
    208206        self.save_on_top = save_on_top 
    209207        self.manager = manager or Manager()