Django

Code

Changeset 434

Show
Ignore:
Timestamp:
08/08/05 14:45:57 (3 years ago)
Author:
adrian
Message:

Fixed typos in generic-views documentation

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/trunk/django/views/generic/list_detail.py

    r307 r434  
    77from django.core.exceptions import Http404, ObjectDoesNotExist 
    88 
    9 def object_list(request, app_label, module_name, paginate_by=None, allow_empty=False,  
     9def object_list(request, app_label, module_name, paginate_by=None, allow_empty=False, 
    1010                template_name=None, extra_lookup_kwargs={}, extra_context={}): 
    1111    """ 
     
    6565        if callable(value): 
    6666            c[key] = value() 
    67         else:    
     67        else: 
    6868            c[key] = value 
    6969    if not template_name: 
     
    7272    return HttpResponse(t.render(c)) 
    7373 
    74 def object_detail(request, app_label, module_name, object_id=None, slug=None,  
    75                   slug_field=None, template_name=None, template_name_field=None,  
     74def object_detail(request, app_label, module_name, object_id=None, slug=None, 
     75                  slug_field=None, template_name=None, template_name_field=None, 
    7676                  extra_lookup_kwargs={}, extra_context={}): 
    7777    """ 
    7878    Generic list of objects. 
    7979 
    80     Templates: ``<app_label>/<module_name>_list`` 
     80    Templates: ``<app_label>/<module_name>_detail`` 
    8181    Context: 
    8282        object 
    83             the object (whoa!) 
     83            the object 
    8484    """ 
    8585    mod = models.get_module(app_label, module_name) 
    8686    lookup_kwargs = {} 
    8787    if object_id: 
    88         lookup_kwargs['%s__exact' % mod.Klass._meta.pk.name] = object_id 
     88        lookup_kwargs['pk'] = object_id 
    8989    elif slug and slug_field: 
    9090        lookup_kwargs['%s__exact' % slug_field] = slug 
     
    109109        if callable(value): 
    110110            c[key] = value() 
    111         else:    
     111        else: 
    112112            c[key] = value 
    113113    response = HttpResponse(t.render(c)) 
  • django/trunk/docs/generic_views.txt

    r312 r434  
    194194=============================== 
    195195 
    196 The list-detail generic views (in the ``django.views.generic.list_detail`` 
    197 module) are similar to the data-based ones, except the list-detail views simply 
    198 have two views: a list of objects, and an individual object page. 
     196The list-detail generic-view framework (in the 
     197``django.views.generic.list_detail`` module) is similar to the date-based one, 
     198except the former simply has two views: a list of objects and an individual 
     199object page. 
    199200 
    200201All these views take the same three optional arguments as the date-based ones 
    201 (and they obviously do not accept or require the date field argument)
     202-- and, clearly, they don't accept the ``date_field`` argument
    202203 
    203204Individual views are: