Django

Code

Changeset 3022

Show
Ignore:
Timestamp:
05/31/06 10:08:06 (2 years ago)
Author:
adrian
Message:

Fixed #2000 -- Added 'mimetype' parameter to generic views. Thanks, Ian Holsman

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/views/generic/date_based.py

    r2809 r3022  
    77def archive_index(request, queryset, date_field, num_latest=15, 
    88        template_name=None, template_loader=loader, 
    9         extra_context={}, allow_empty=False, context_processors=None): 
     9        extra_context={}, allow_empty=False, context_processors=None, 
     10        mimetype=None): 
    1011    """ 
    1112    Generic top-level archive of date-based objects. 
    …… 
    4142        else: 
    4243            c[key] = value 
    43     return HttpResponse(t.render(c)) 
     44    return HttpResponse(t.render(c), mimetype=mimetype) 
    4445 
    4546def archive_year(request, year, queryset, date_field, template_name=None, 
    4647        template_loader=loader, extra_context={}, allow_empty=False, 
    47         context_processors=None): 
     48        context_processors=None, mimetype=None): 
    4849    """ 
    4950    Generic yearly archive view. 
    …… 
    7980        else: 
    8081            c[key] = value 
    81     return HttpResponse(t.render(c)) 
     82    return HttpResponse(t.render(c), mimetype=mimetype) 
    8283 
    8384def archive_month(request, year, month, queryset, date_field, 
    8485        month_format='%b', template_name=None, template_loader=loader, 
    8586        extra_context={}, allow_empty=False, context_processors=None, 
    86         template_object_name='object'): 
     87        template_object_name='object', mimetype=None): 
    8788    """ 
    8889    Generic monthly archive view. 
    …… 
    135136        else: 
    136137            c[key] = value 
    137     return HttpResponse(t.render(c)) 
     138    return HttpResponse(t.render(c), mimetype=mimetype) 
    138139 
    139140def archive_week(request, year, week, queryset, date_field, 
    140141        template_name=None, template_loader=loader, 
    141142        extra_context={}, allow_empty=True, context_processors=None, 
    142         template_object_name='object'): 
     143        template_object_name='object', mimetype=None): 
    143144    """ 
    144145    Generic weekly archive view. 
    …… 
    182183        else: 
    183184            c[key] = value 
    184     return HttpResponse(t.render(c)) 
     185    return HttpResponse(t.render(c), mimetype=mimetype) 
    185186 
    186187def archive_day(request, year, month, day, queryset, date_field, 
    187188        month_format='%b', day_format='%d', template_name=None, 
    188189        template_loader=loader, extra_context={}, allow_empty=False, 
    189         context_processors=None, template_object_name='object'): 
     190        context_processors=None, template_object_name='object', 
     191        mimetype=None): 
    190192    """ 
    191193    Generic daily archive view. 
    …… 
    234236        else: 
    235237            c[key] = value 
    236     return HttpResponse(t.render(c)) 
     238    return HttpResponse(t.render(c), mimetype=mimetype) 
    237239 
    238240def archive_today(request, **kwargs): 
    …… 
    252254        slug_field=None, template_name=None, template_name_field=None, 
    253255        template_loader=loader, extra_context={}, context_processors=None, 
    254         template_object_name='object'): 
     256        template_object_name='object', mimetype=None): 
    255257    """ 
    256258    Generic detail view from year/month/day/slug or year/month/day/id structure. 
    …… 
    301303        else: 
    302304            c[key] = value 
    303     response = HttpResponse(t.render(c)) 
     305    response = HttpResponse(t.render(c), mimetype=mimetype) 
    304306    populate_xheaders(request, response, model, getattr(obj, obj._meta.pk.name)) 
    305307    return response 

  • django/trunk/django/views/generic/list_detail.py

    r2969 r3022  
    77def object_list(request, queryset, paginate_by=None, allow_empty=False, 
    88        template_name=None, template_loader=loader, 
    9         extra_context={}, context_processors=None, template_object_name='object'): 
     9        extra_context={}, context_processors=None, template_object_name='object', 
     10        mimetype=None): 
    1011    """ 
    1112    Generic list of objects. 
    …… 
    7475        template_name = "%s/%s_list.html" % (model._meta.app_label, model._meta.object_name.lower()) 
    7576    t = template_loader.get_template(template_name) 
    76     return HttpResponse(t.render(c)) 
     77    return HttpResponse(t.render(c), mimetype=mimetype) 
    7778 
    7879def object_detail(request, queryset, object_id=None, slug=None, 
    7980        slug_field=None, template_name=None, template_name_field=None, 
    8081        template_loader=loader, extra_context={}, 
    81         context_processors=None, template_object_name='object'): 
     82        context_processors=None, template_object_name='object', 
     83        mimetype=None): 
    8284    """ 
    8385    Generic list of objects. 
    …… 
    114116        else: 
    115117            c[key] = value 
    116     response = HttpResponse(t.render(c)) 
     118    response = HttpResponse(t.render(c), mimetype=mimetype) 
    117119    populate_xheaders(request, response, model, getattr(obj, obj._meta.pk.name)) 
    118120    return response 

  • django/trunk/docs/generic_views.txt

    r2949 r3022  
    183183      the view's template. See the `RequestContext docs`_. 
    184184 
     185    * ``mimetype``: The MIME type to use for the resulting document. Defaults 
     186      to the value of the ``DEFAULT_MIME_TYPE`` setting. 
     187 
    185188**Template name:** 
    186189 
    …… 
    248251      the view's template. See the `RequestContext docs`_. 
    249252 
     253    * ``mimetype``: The MIME type to use for the resulting document. Defaults 
     254      to the value of the ``DEFAULT_MIME_TYPE`` setting. 
     255 
    250256**Template name:** 
    251257 
    …… 
    315321       determining the variable's name. 
    316322 
     323    * ``mimetype``: The MIME type to use for the resulting document. Defaults 
     324      to the value of the ``DEFAULT_MIME_TYPE`` setting. 
     325 
    317326**Template name:** 
    318327 
    …… 
    387396       view will append ``'_list'`` to the value of this parameter in 
    388397       determining the variable's name. 
     398 
     399    * ``mimetype``: The MIME type to use for the resulting document. Defaults 
     400      to the value of the ``DEFAULT_MIME_TYPE`` setting. 
    389401 
    390402**Template name:** 
    …… 
    463475       view will append ``'_list'`` to the value of this parameter in 
    464476       determining the variable's name. 
     477 
     478    * ``mimetype``: The MIME type to use for the resulting document. Defaults 
     479      to the value of the ``DEFAULT_MIME_TYPE`` setting. 
    465480 
    466481**Template name:** 
    …… 
    564579       to use in the template context. By default, this is ``'object'``. 
    565580 
     581    * ``mimetype``: The MIME type to use for the resulting document. Defaults 
     582      to the value of the ``DEFAULT_MIME_TYPE`` setting. 
     583 
    566584**Template name:** 
    567585 
    …… 
    627645       view will append ``'_list'`` to the value of this parameter in 
    628646       determining the variable's name. 
     647 
     648    * ``mimetype``: The MIME type to use for the resulting document. Defaults 
     649      to the value of the ``DEFAULT_MIME_TYPE`` setting. 
    629650 
    630651**Template name:** 
    …… 
    718739       to use in the template context. By default, this is ``'object'``. 
    719740 
     741    * ``mimetype``: The MIME type to use for the resulting document. Defaults 
     742      to the value of the ``DEFAULT_MIME_TYPE`` setting. 
     743 
    720744**Template name:** 
    721745