Ticket #16918: 16918.diff

tests/regressiontests/generic_views/views.py

@@ -177 +177 @@
 class AuthorGetQuerySetFormView(generic.edit.ModelFormMixin):
     def get_queryset(self):
         return Author.objects.all()
+
+class BookDetail16918(BookDetail):
+    # testing for #16918
+    def get_object(self, queryset=None):
+        return super(BookDetail16918,self).get_object(queryset=Book.objects.filter(pk=2))
+

tests/regressiontests/generic_views/dates.py

@@ -412 +412 @@
     def test_invalid_url(self):
         self.assertRaises(AttributeError, self.client.get, "/dates/books/2008/oct/01/nopk/")
 
+    def test_16918(self):
+    # testing for #16918
+        res = self.client.get('/dates/books/16918/2006/may/01/2/')
+        self.assertEqual(res.status_code, 200)
+        self.assertEqual(res.context['object'], Book.objects.get(pk=2))
+        self.assertEqual(res.context['book'], Book.objects.get(pk=2))
+        self.assertTemplateUsed(res, 'generic_views/book_detail.html')
+
+        res = self.client.get('/dates/books/16918/2008/oct/01/1/')
+        self.assertEqual(res.status_code, 404)
+    

tests/regressiontests/generic_views/urls.py

@@ -216 +216 @@
     (r'^dates/books/(?P<year>\d{4})/(?P<month>[a-z]{3})/(?P<day>\d{1,2})/byslug/(?P<slug>[\w-]+)/$',
         views.BookDetail.as_view()),
 
+    # testing for #16918
+    (r'^dates/books/16918/(?P<year>\d{4})/(?P<month>[a-z]{3})/(?P<day>\d{1,2})/(?P<pk>\d+)/$',
+        views.BookDetail16918.as_view()),
+
     # Useful for testing redirects
     (r'^accounts/login/$',  'django.contrib.auth.views.login')
 )

django/views/generic/dates.py

@@ -459 +459 @@
                                  month, self.get_month_format(),
                                  day, self.get_day_format())
 
-        qs = self.get_queryset()
+        if queryset is None:
+            qs = self.get_queryset()
+        else:
+            qs = queryset
 
         if not self.get_allow_future() and date > datetime.date.today():
             raise Http404(_(u"Future %(verbose_name_plural)s not available because %(class_name)s.allow_future is False.") % {