Ticket #7758: 7758_2.patch

django/contrib/admin/options.py

@@ -1009 +1009 @@
 
     @csrf_protect_m
     @transaction.commit_on_success
-    def change_view(self, request, object_id, extra_context=None):
+    def change_view(self, request, object_id, form_url='', extra_context=None):
         "The 'change' admin view for this model."
         model = self.model
         opts = model._meta
@@ -1097 +1097 @@
             'app_label': opts.app_label,
         }
         context.update(extra_context or {})
-        return self.render_change_form(request, context, change=True, obj=obj)
+        return self.render_change_form(request, context, change=True, obj=obj, form_url=form_url)
 
     @csrf_protect_m
     def changelist_view(self, request, extra_context=None):

tests/regressiontests/admin_views/tests.py

@@ -573 +573 @@
         except SuspiciousOperation:
             self.fail("Filters should be allowed if they are defined on a ForeignKey pointing to this model")
 
+class AdminViewFormUrlTest(TestCase):
+    urls = "regressiontests.admin_views.urls"
+    fixtures = ["admin-views-users.xml"]
+    urlbit = "admin3"
+
+    def setUp(self):
+        self.client.login(username='super', password='secret')
+
+    def tearDown(self):
+        self.client.logout()
+
+    def testChangeFormUrlHasCorrectValue(self):
+        """
+        Tests whether change_view has form_url in request.context
+        """
+        response = self.client.get('/test_admin/%s/admin_views/section/1/' % self.urlbit)
+        self.assertTrue('form_url' in response.context, msg='form_url not present in response.context')
+        self.assertEqual(response.context['form_url'], 'pony')
+
 class AdminJavaScriptTest(AdminViewBasicTest):
     urls = "regressiontests.admin_views.urls"
 

tests/regressiontests/admin_views/urls.py

@@ -10 +10 @@
     (r'^test_admin/admin/secure-view/$', views.secure_view),
     (r'^test_admin/admin/', include(admin.site.urls)),
     (r'^test_admin/admin2/', include(customadmin.site.urls)),
+    (r'^test_admin/admin3/', include(admin.site.urls), dict(form_url='pony')),
 )