Ticket #16101: patch_commit_9b22091813e7.patch

django/views/generic/detail.py

@@ -15 +15 @@
     queryset = None
     slug_field = 'slug'
     context_object_name = None
+    slug_url_kwarg = 'slug'
+    pk_url_kwarg = 'pk'
 
     def get_object(self, queryset=None):
         """
@@ -29 +31 @@
             queryset = self.get_queryset()
 
         # Next, try looking up by primary key.
-        pk = self.kwargs.get('pk', None)
-        slug = self.kwargs.get('slug', None)
+        pk = self.kwargs.get(self.get_pk_url_kwarg(), None)
+        slug = self.kwargs.get(self.get_slug_url_kwarg(), None)
         if pk is not None:
             queryset = queryset.filter(pk=pk)
 
@@ -74 +76 @@
         """
         return self.slug_field
 
+    def get_slug_url_kwarg(self):
+        """
+        Get the name of the URL keyword to be used to look up by slug.
+        """
+        return self.slug_url_kwarg
+
+    def get_pk_url_kwarg(self):
+        """
+        Get the name of the URL keyword to be used to look up by pk.
+        """
+        return self.pk_url_kwarg
+
     def get_context_object_name(self, obj):
         """
         Get the name to use for the object.

docs/ref/class-based-views.txt

@@ -136 +136 @@
         The name of the field on the model that contains the slug. By default,
         ``slug_field`` is ``'slug'``.
 
+    .. attribute:: slug_url_kwarg
+
+        The name of the URL keyword that contains the slug. By default,
+        ``slug_url_kwarg`` is ``'slug'``.
+
+    .. attribute:: pk_url_kwarg
+
+        The name of the URL keyword that contains the primary key. By default,
+        ``pk_url_kwarg`` is ``'pk'``.
+
     .. attribute:: context_object_name
 
         Designates the name of the variable to use in the context.
@@ -146 +156 @@
         ``queryset`` is provided, that queryset will be used as the
         source of objects; otherwise,
         :meth:`~SingleObjectMixin.get_queryset` will be used.
-        :meth:`~SingleObjectMixin.get_object` looks for a ``pk``
-        argument in the arguments to the view; if ``pk`` is found,
-        this method performs a primary-key based lookup using that
-        value. If no ``pk`` argument is found, it looks for a ``slug``
+        :meth:`~SingleObjectMixin.get_object` looks for a
+        :attr:`SingleObjectMixin.pk_url_kwarg` argument in the arguments
+        to the view; if this argument is found, this method performs a
+        primary-key based lookup using that value. If this argument is not
+        found, it looks for a :attr:`SingleObjectMixin.slug_url_kwarg`
         argument, and performs a slug lookup using the
         :attr:`SingleObjectMixin.slug_field`.
 

tests/regressiontests/generic_views/detail.py

@@ -21 +21 @@
         self.assertEqual(res.context['author'], Author.objects.get(pk=1))
         self.assertTemplateUsed(res, 'generic_views/author_detail.html')
 
+    def test_detail_by_custom_pk(self):
+        res = self.client.get('/detail/author/bycustompk/1/')
+        self.assertEqual(res.status_code, 200)
+        self.assertEqual(res.context['object'], Author.objects.get(pk=1))
+        self.assertEqual(res.context['author'], Author.objects.get(pk=1))
+        self.assertTemplateUsed(res, 'generic_views/author_detail.html')
+
     def test_detail_by_slug(self):
         res = self.client.get('/detail/author/byslug/scott-rosenberg/')
         self.assertEqual(res.status_code, 200)
         self.assertEqual(res.context['object'], Author.objects.get(slug='scott-rosenberg'))
         self.assertEqual(res.context['author'], Author.objects.get(slug='scott-rosenberg'))
         self.assertTemplateUsed(res, 'generic_views/author_detail.html')
+    
+    def test_detail_by_custom_slug(self):
+        res = self.client.get('/detail/author/bycustomslug/scott-rosenberg/')
+        self.assertEqual(res.status_code, 200)
+        self.assertEqual(res.context['object'], Author.objects.get(slug='scott-rosenberg'))
+        self.assertEqual(res.context['author'], Author.objects.get(slug='scott-rosenberg'))
+        self.assertTemplateUsed(res, 'generic_views/author_detail.html')
 
     def test_verbose_name(self):
         res = self.client.get('/detail/artist/1/')

tests/regressiontests/generic_views/urls.py

@@ -30 +30 @@
     url(r'^detail/author/(?P<pk>\d+)/$',
         views.AuthorDetail.as_view(),
         name="author_detail"),
+    (r'^detail/author/bycustompk/(?P<foo>\d+)/$',
+        views.AuthorDetail.as_view(pk_url_kwarg='foo')),                                              
     (r'^detail/author/byslug/(?P<slug>[\w-]+)/$',
         views.AuthorDetail.as_view()),
+    (r'^detail/author/bycustomslug/(?P<foo>[\w-]+)/$',
+        views.AuthorDetail.as_view(slug_url_kwarg='foo')),                       
     (r'^detail/author/(?P<pk>\d+)/template_name_suffix/$',
         views.AuthorDetail.as_view(template_name_suffix='_view')),
     (r'^detail/author/(?P<pk>\d+)/template_name/$',