Author: mtredinnick
Date: 2007-08-12 07:59:41 -0500 (Sun, 12 Aug 2007)
New Revision: 5877
Modified:
django/trunk/AUTHORS
django/trunk/django/views/generic/create_update.py
django/trunk/django/views/generic/date_based.py
django/trunk/django/views/generic/list_detail.py
django/trunk/docs/generic_views.txt
Log:
Fixed #5085 -- In generic views, set the default name for the slug field to
'slug'. Thanks, Trevor Caira.
Modified: django/trunk/AUTHORS
===================================================================
--- django/trunk/AUTHORS 2007-08-12 12:49:01 UTC (rev 5876)
+++ django/trunk/AUTHORS 2007-08-12 12:59:41 UTC (rev 5877)
@@ -67,6 +67,7 @@
Andrew Brehaut <http://brehaut.net/blog>
[EMAIL PROTECTED]
Jonathan Buchanan <[EMAIL PROTECTED]>
+ Trevor Caira <[EMAIL PROTECTED]>
Ricardo Javier Cárdenes Medina <[EMAIL PROTECTED]>
Antonio Cavedoni <http://cavedoni.com/>
C8E
Modified: django/trunk/django/views/generic/create_update.py
===================================================================
--- django/trunk/django/views/generic/create_update.py 2007-08-12 12:49:01 UTC
(rev 5876)
+++ django/trunk/django/views/generic/create_update.py 2007-08-12 12:59:41 UTC
(rev 5877)
@@ -71,7 +71,7 @@
return HttpResponse(t.render(c))
def update_object(request, model, object_id=None, slug=None,
- slug_field=None, template_name=None, template_loader=loader,
+ slug_field='slug', template_name=None, template_loader=loader,
extra_context=None, post_save_redirect=None,
login_required=False, follow=None, context_processors=None,
template_object_name='object'):
@@ -146,7 +146,7 @@
return response
def delete_object(request, model, post_delete_redirect,
- object_id=None, slug=None, slug_field=None, template_name=None,
+ object_id=None, slug=None, slug_field='slug', template_name=None,
template_loader=loader, extra_context=None,
login_required=False, context_processors=None,
template_object_name='object'):
"""
Modified: django/trunk/django/views/generic/date_based.py
===================================================================
--- django/trunk/django/views/generic/date_based.py 2007-08-12 12:49:01 UTC
(rev 5876)
+++ django/trunk/django/views/generic/date_based.py 2007-08-12 12:59:41 UTC
(rev 5877)
@@ -286,7 +286,7 @@
def object_detail(request, year, month, day, queryset, date_field,
month_format='%b', day_format='%d', object_id=None, slug=None,
- slug_field=None, template_name=None, template_name_field=None,
+ slug_field='slug', template_name=None, template_name_field=None,
template_loader=loader, extra_context=None, context_processors=None,
template_object_name='object', mimetype=None, allow_future=False):
"""
Modified: django/trunk/django/views/generic/list_detail.py
===================================================================
--- django/trunk/django/views/generic/list_detail.py 2007-08-12 12:49:01 UTC
(rev 5876)
+++ django/trunk/django/views/generic/list_detail.py 2007-08-12 12:59:41 UTC
(rev 5877)
@@ -87,7 +87,7 @@
return HttpResponse(t.render(c), mimetype=mimetype)
def object_detail(request, queryset, object_id=None, slug=None,
- slug_field=None, template_name=None, template_name_field=None,
+ slug_field='slug', template_name=None, template_name_field=None,
template_loader=loader, extra_context=None,
context_processors=None, template_object_name='object',
mimetype=None):
Modified: django/trunk/docs/generic_views.txt
===================================================================
--- django/trunk/docs/generic_views.txt 2007-08-12 12:49:01 UTC (rev 5876)
+++ django/trunk/docs/generic_views.txt 2007-08-12 12:59:41 UTC (rev 5877)
@@ -40,7 +40,7 @@
}
urlpatterns = patterns('django.views.generic.date_based',
-
(r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/(?P<day>\w{1,2})/(?P<slug>[-\w]+)/$',
'object_detail', dict(info_dict, slug_field='slug')),
+
(r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/(?P<day>\w{1,2})/(?P<slug>[-\w]+)/$',
'object_detail', info_dict),
(r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/(?P<day>\w{1,2})/$',
'archive_day', info_dict),
(r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/$',
'archive_month', info_dict),
(r'^(?P<year>\d{4})/$',
'archive_year', info_dict),
@@ -603,7 +603,7 @@
Otherwise, ``slug`` should be the slug of the given object, and
``slug_field`` should be the name of the slug field in the ``QuerySet``'s
- model.
+ model. By default, ``slug_field`` is ``'slug'``.
**Optional arguments:**
@@ -804,7 +804,7 @@
Otherwise, ``slug`` should be the slug of the given object, and
``slug_field`` should be the name of the slug field in the ``QuerySet``'s
- model.
+ model. By default, ``slug_field`` is ``'slug'``.
**Optional arguments:**
@@ -948,7 +948,7 @@
Otherwise, ``slug`` should be the slug of the given object, and
``slug_field`` should be the name of the slug field in the ``QuerySet``'s
- model.
+ model. By default, ``slug_field`` is ``'slug'``.
**Optional arguments:**
@@ -1033,7 +1033,7 @@
Otherwise, ``slug`` should be the slug of the given object, and
``slug_field`` should be the name of the slug field in the ``QuerySet``'s
- model.
+ model. By default, ``slug_field`` is ``'slug'``.
* ``post_delete_redirect``: A URL to which the view will redirect after
deleting the object.
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
