Django

Code

Changeset 4332

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

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r4331 r4332  
    3737    list_display_links = () 
    3838    list_filter = () 
     39    date_hierarchy = None 
    3940 
    4041    def __init__(self, model): 
    …… 
    272273            raise PermissionDenied 
    273274        try: 
    274             cl = ChangeList(request, self.model, self.list_display, self.list_display_links, self.list_filter) 
     275            cl = ChangeList(request, self.model, self.list_display, self.list_display_links, self.list_filter, 
     276                self.date_hierarchy) 
    275277        except IncorrectLookupParameters: 
    276278            # Wacky lookup parameters were given, so redirect to the main 

  • django/branches/newforms-admin/django/contrib/admin/templatetags/admin_list.py

    r4331 r4332  
    194194 
    195195def date_hierarchy(cl): 
    196     if cl.lookup_opts.admin.date_hierarchy: 
    197         field_name = cl.lookup_opts.admin.date_hierarchy 
     196    if cl.date_hierarchy: 
     197        field_name = cl.date_hierarchy 
    198198        year_field = '%s__year' % field_name 
    199199        month_field = '%s__month' % field_name 

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

    r4331 r4332  
    293293 
    294294class ChangeList(object): 
    295     def __init__(self, request, model, list_display, list_display_links, list_filter): 
     295    def __init__(self, request, model, list_display, list_display_links, list_filter, date_hierarchy): 
    296296        self.model = model 
    297297        self.opts = model._meta 
    …… 
    301301        self.list_display_links = list_display_links 
    302302        self.list_filter = list_filter 
     303        self.date_hierarchy = date_hierarchy 
    303304 
    304305        # Get search parameters from the query string. 

  • django/branches/newforms-admin/django/core/management.py

    r4331 r4332  
    10201020                            e.add(opts, '"admin.list_filter" refers to %r, which isn\'t a field.' % fn) 
    10211021                # date_hierarchy 
    1022                 if opts.admin.date_hierarchy: 
     1022                if opts.ModelAdmin.date_hierarchy: 
    10231023                    try: 
    1024                         f = opts.get_field(opts.admin.date_hierarchy) 
     1024                        f = opts.get_field(opts.ModelAdmin.date_hierarchy) 
    10251025                    except models.FieldDoesNotExist: 
    1026                         e.add(opts, '"admin.date_hierarchy" refers to %r, which isn\'t a field.' % opts.admin.date_hierarchy) 
     1026                        e.add(opts, '"admin.date_hierarchy" refers to %r, which isn\'t a field.' % opts.ModelAdmin.date_hierarchy) 
    10271027 
    10281028        # Check ordering attribute. 

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

    r4331 r4332  
    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')])) 
     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')])) 
    141141            value.contribute_to_class(cls, name) 
    142142        elif hasattr(value, 'contribute_to_class'): 

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

    r4331 r4332  
    201201class AdminOptions(object): 
    202202    def __init__(self, fields=None, js=None, 
    203         date_hierarchy=None, save_as=False, ordering=None, search_fields=None, 
     203        save_as=False, ordering=None, search_fields=None, 
    204204        save_on_top=False, list_select_related=False, manager=None, list_per_page=100): 
    205205        self.fields = fields 
    206206        self.js = js or [] 
    207         self.date_hierarchy = date_hierarchy 
    208207        self.save_as, self.ordering = save_as, ordering 
    209208        self.search_fields = search_fields or []