Merge pull request #1116 from elektrrrus/ticket_20234_20236

Ticket 20234 20236

4 files changed, 23 insertions, 19 deletions

diff --git a/django/views/generic/detail.py b/django/views/generic/detail.py
index 58302bbe23..23000641b4 100644
--- a/django/views/generic/detail.py
+++ b/django/views/generic/detail.py
@@ -93,9 +93,11 @@ class SingleObjectMixin(ContextMixin):
         Insert the single object into the context dict.
         """
         context = {}
-        context_object_name = self.get_context_object_name(self.object)
-        if context_object_name:
-            context[context_object_name] = self.object
+        if self.object:
+            context['object'] = self.object
+            context_object_name = self.get_context_object_name(self.object)
+            if context_object_name:
+                context[context_object_name] = self.object
         context.update(kwargs)
         return super(SingleObjectMixin, self).get_context_data(**context)
 
@@ -122,7 +124,7 @@ class SingleObjectTemplateResponseMixin(TemplateResponseMixin):
         * the value of ``template_name`` on the view (if provided)
         * the contents of the ``template_name_field`` field on the
           object instance that the view is operating upon (if available)
-        * ``<app_label>/<object_name><template_name_suffix>.html``        
+        * ``<app_label>/<object_name><template_name_suffix>.html``
         """
         try:
             names = super(SingleObjectTemplateResponseMixin, self).get_template_names()
diff --git a/django/views/generic/edit.py b/django/views/generic/edit.py
index e2cc741ffb..cf87aeed27 100644
--- a/django/views/generic/edit.py
+++ b/django/views/generic/edit.py
@@ -136,20 +136,6 @@ class ModelFormMixin(FormMixin, SingleObjectMixin):
         self.object = form.save()
         return super(ModelFormMixin, self).form_valid(form)
 
-    def get_context_data(self, **kwargs):
-        """
-        If an object has been supplied, inject it into the context with the
-        supplied context_object_name name.
-        """
-        context = {}
-        if self.object:
-            context['object'] = self.object
-            context_object_name = self.get_context_object_name(self.object)
-            if context_object_name:
-                context[context_object_name] = self.object
-        context.update(kwargs)
-        return super(ModelFormMixin, self).get_context_data(**context)
-
 
 class ProcessFormView(View):
     """
diff --git a/tests/generic_views/test_base.py b/tests/generic_views/test_base.py
index 2eadee2b42..ffdad4b69f 100644
--- a/tests/generic_views/test_base.py
+++ b/tests/generic_views/test_base.py
@@ -412,6 +412,19 @@ class GetContextDataTest(unittest.TestCase):
         context = test_view.get_context_data(test_name='test_value')
         self.assertEqual(context['test_name'], 'test_value')
 
+    def test_object_at_custom_name_in_context_data(self):
+        # Checks 'pony' key presence in dict returned by get_context_date
+        test_view = views.CustomSingleObjectView()
+        test_view.context_object_name = 'pony'
+        context = test_view.get_context_data()
+        self.assertEqual(context['pony'], test_view.object)
+
+    def test_object_in_get_context_data(self):
+        # Checks 'object' key presence in dict returned by get_context_date #20234
+        test_view = views.CustomSingleObjectView()
+        context = test_view.get_context_data()
+        self.assertEqual(context['object'], test_view.object)
+
 
 class UseMultipleObjectMixinTest(unittest.TestCase):
     rf = RequestFactory()
diff --git a/tests/generic_views/views.py b/tests/generic_views/views.py
index 4dda3fe0e0..fd331f14b7 100644
--- a/tests/generic_views/views.py
+++ b/tests/generic_views/views.py
@@ -1,7 +1,6 @@
 from __future__ import absolute_import
 
 from django.contrib.auth.decorators import login_required
-from django.contrib.messages.views import SuccessMessageMixin
 from django.core.paginator import Paginator
 from django.core.urlresolvers import reverse, reverse_lazy
 from django.utils.decorators import method_decorator
@@ -227,6 +226,10 @@ class CustomContextView(generic.detail.SingleObjectMixin, generic.View):
     def get_context_object_name(self, obj):
         return "test_name"
 
+class CustomSingleObjectView(generic.detail.SingleObjectMixin, generic.View):
+    model = Book
+    object = Book(name="dummy")
+
 class BookSigningConfig(object):
     model = BookSigning
     date_field = 'event_date'