Ticket #17795: t17795.diff

django/views/generic/dates.py

@@ -171 +171 @@
     def get(self, request, *args, **kwargs):
         self.date_list, self.object_list, extra_context = self.get_dated_items()
         context = self.get_context_data(object_list=self.object_list,
-                                        date_list=self.date_list)
+                                        date_list=self.date_list, **kwargs)
         context.update(extra_context)
         return self.render_to_response(context)
 

django/views/generic/detail.py

@@ -96 +96 @@
 class BaseDetailView(SingleObjectMixin, View):
     def get(self, request, *args, **kwargs):
         self.object = self.get_object()
-        context = self.get_context_data(object=self.object)
+        context = self.get_context_data(object=self.object, **kwargs)
         return self.render_to_response(context)
 
 

django/views/generic/edit.py

@@ -129 +129 @@
     def get(self, request, *args, **kwargs):
         form_class = self.get_form_class()
         form = self.get_form(form_class)
-        return self.render_to_response(self.get_context_data(form=form))
+        kwargs['form'] = form
+        return self.render_to_response(self.get_context_data(**kwargs))
 
     def post(self, request, *args, **kwargs):
         form_class = self.get_form_class()

django/views/generic/list.py

@@ -116 +116 @@
         if not allow_empty and len(self.object_list) == 0:
             raise Http404(_(u"Empty list and '%(class_name)s.allow_empty' is False.")
                           % {'class_name': self.__class__.__name__})
-        context = self.get_context_data(object_list=self.object_list)
+        context = self.get_context_data(object_list=self.object_list, **kwargs)
         return self.render_to_response(context)
 
 

tests/regressiontests/generic_views/edit.py

@@ -15 +15 @@
         form_class = views.AuthorGetQuerySetFormView().get_form_class()
         self.assertEqual(form_class._meta.model, Author)
 
+
 class CreateViewTests(TestCase):
     urls = 'regressiontests.generic_views.urls'
 
@@ -78 +79 @@
         self.assertRedirects(res, reverse('author_detail', kwargs={'pk': obj.pk}))
         self.assertQuerysetEqual(Author.objects.all(), ['<Author: Randall Munroe>'])
 
+    def test_regression_t17795(self):
+        res = self.client.get('/edit/authors/create/special/t17795/')
+        self.assertEqual(res.status_code, 200)
+        self.assertIn('key', res.context, msg='key from get_context_data is expected')
+        self.assertIn('new_key', res.context, msg='new_key from get is expected')
+
     def test_create_without_redirect(self):
         try:
             res = self.client.post('/edit/authors/create/naive/',
@@ -92 +99 @@
         self.assertEqual(res.status_code, 302)
         self.assertRedirects(res, 'http://testserver/accounts/login/?next=/edit/authors/create/restricted/')
 
+
 class UpdateViewTests(TestCase):
     urls = 'regressiontests.generic_views.urls'
 
@@ -224 +232 @@
         self.assertRedirects(res, 'http://testserver/list/authors/')
         self.assertQuerysetEqual(Author.objects.all(), ['<Author: Randall Munroe (xkcd)>'])
 
+
 class DeleteViewTests(TestCase):
     urls = 'regressiontests.generic_views.urls'
 

tests/regressiontests/generic_views/urls.py

@@ -71 +71 @@
         views.AuthorCreate.as_view()),
     (r'^edit/authors/create/special/$',
         views.SpecializedAuthorCreate.as_view()),
+    (r'^edit/authors/create/special/t17795/$',
+        views.CreateView_t17795.as_view()),
 
     (r'^edit/author/(?P<pk>\d+)/update/naive/$',
         views.NaiveAuthorUpdate.as_view()),

tests/regressiontests/generic_views/views.py

@@ -184 +184 @@
     def get_object(self, queryset=None):
         return super(BookDetailGetObjectCustomQueryset,self).get_object(
             queryset=Book.objects.filter(pk=2))
+
+
+class CreateView_t17795(generic.CreateView):
+    model = Author
+    form_class = AuthorForm
+    template_name = 'generic_views/form.html'
+    context_object_name = 'thingy'
+
+    def get_success_url(self):
+        return reverse('author_detail', args=[self.object.id,])
+
+    def get_context_data(self, **kwargs):
+        kwargs.update({'key': 'value'})
+        return super(CreateView_t17795, self).get_context_data(**kwargs)
+
+    def get(self, request, *args, **kwargs):
+        kwargs.update({'new_key': 'new value'})
+        return super(CreateView_t17795, self).get(request, *args, **kwargs)