Django

Code

Changeset 4334

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

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r4333 r4334  
    3737    list_display_links = () 
    3838    list_filter = () 
     39    search_fields = () 
    3940    date_hierarchy = None 
    4041    save_as = False 
    …… 
    275276        try: 
    276277            cl = ChangeList(request, self.model, self.list_display, self.list_display_links, self.list_filter, 
    277                 self.date_hierarchy) 
     278                self.date_hierarchy, self.search_fields) 
    278279        except IncorrectLookupParameters: 
    279280            # Wacky lookup parameters were given, so redirect to the main 

  • django/branches/newforms-admin/django/contrib/admin/templates/admin/search_form.html

    r4165 r4334  
    11{% load adminmedia %} 
    22{% load i18n %} 
    3 {% if cl.lookup_opts.admin.search_fields %} 
     3{% if cl.search_fields %} 
    44<div id="toolbar"><form id="changelist-search" action="" method="get"> 
    55<div><!-- DIV needed for valid HTML --> 

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

    r4332 r4334  
    293293 
    294294class ChangeList(object): 
    295     def __init__(self, request, model, list_display, list_display_links, list_filter, date_hierarchy): 
     295    def __init__(self, request, model, list_display, list_display_links, list_filter, date_hierarchy, search_fields): 
    296296        self.model = model 
    297297        self.opts = model._meta 
    …… 
    302302        self.list_filter = list_filter 
    303303        self.date_hierarchy = date_hierarchy 
     304        self.search_fields = search_fields 
    304305 
    305306        # Get search parameters from the query string. 
    …… 
    475476                return "%s__icontains" % field_name 
    476477 
    477         if self.lookup_opts.admin.search_fields and self.query: 
     478        if self.search_fields and self.query: 
    478479            for bit in self.query.split(): 
    479                 or_queries = [models.Q(**{construct_search(field_name): bit}) for field_name in self.lookup_opts.admin.search_fields] 
     480                or_queries = [models.Q(**{construct_search(field_name): bit}) for field_name in self.search_fields] 
    480481                other_qs = QuerySet(self.model) 
    481482                if qs._select_related: 

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

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

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

    r4333 r4334  
    201201class AdminOptions(object): 
    202202    def __init__(self, fields=None, js=None, 
    203         ordering=None, search_fields=None, 
     203        ordering=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 [] 
    207207        self.ordering = ordering 
    208         self.search_fields = search_fields or [] 
    209208        self.save_on_top = save_on_top 
    210209        self.list_select_related = list_select_related