Django

Code

Changeset 4336

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

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r4335 r4336  
    3838    list_filter = () 
    3939    list_select_related = False 
     40    list_per_page = 100 
    4041    search_fields = () 
    4142    date_hierarchy = None 
    …… 
    277278        try: 
    278279            cl = ChangeList(request, self.model, self.list_display, self.list_display_links, self.list_filter, 
    279                 self.date_hierarchy, self.search_fields, self.list_select_related) 
     280                self.date_hierarchy, self.search_fields, self.list_select_related, self.list_per_page) 
    280281        except IncorrectLookupParameters: 
    281282            # Wacky lookup parameters were given, so redirect to the main 

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

    r4335 r4336  
    293293 
    294294class ChangeList(object): 
    295     def __init__(self, request, model, list_display, list_display_links, list_filter, date_hierarchy, search_fields, list_select_related): 
     295    def __init__(self, request, model, list_display, list_display_links, list_filter, date_hierarchy, search_fields, list_select_related, list_per_page): 
    296296        self.model = model 
    297297        self.opts = model._meta 
    …… 
    304304        self.search_fields = search_fields 
    305305        self.list_select_related = list_select_related 
     306        self.list_per_page = list_per_page 
    306307 
    307308        # Get search parameters from the query string. 
    …… 
    352353 
    353354    def get_results(self, request): 
    354         paginator = ObjectPaginator(self.query_set, self.lookup_opts.admin.list_per_page) 
     355        paginator = ObjectPaginator(self.query_set, self.list_per_page) 
    355356 
    356357        # Get the number of objects, with admin filters applied. 
    …… 
    374375 
    375376        can_show_all = result_count <= MAX_SHOW_ALL_ALLOWED 
    376         multi_page = result_count > self.lookup_opts.admin.list_per_page 
     377        multi_page = result_count > self.list_per_page 
    377378 
    378379        # Get the list of objects to display on this page. 

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

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

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

    r4335 r4336  
    202202    def __init__(self, fields=None, js=None, 
    203203        ordering=None, 
    204         save_on_top=False, manager=None, list_per_page=100): 
     204        save_on_top=False, manager=None): 
    205205        self.fields = fields 
    206206        self.js = js or [] 
    207207        self.ordering = ordering 
    208208        self.save_on_top = save_on_top 
    209         self.list_per_page = list_per_page 
    210209        self.manager = manager or Manager() 
    211210