Ticket #11416: 11416-admin-caching.diff

django/contrib/admin/options.py

@@ -20 +20 @@
 from django.utils.translation import ugettext as _
 from django.utils.translation import ungettext, ugettext_lazy
 from django.utils.encoding import force_unicode
+from django.views.decorators.cache import never_cache
 try:
     set
 except NameError:
@@ -224 +225 @@
         def wrap(view):
             def wrapper(*args, **kwargs):
                 return self.admin_site.admin_view(view)(*args, **kwargs)
-            return update_wrapper(wrapper, view)
+            return never_cache(update_wrapper(wrapper, view))
 
         info = self.admin_site.name, self.model._meta.app_label, self.model._meta.module_name
 

django/contrib/admin/sites.py

@@ -190 +190 @@
         def wrap(view):
             def wrapper(*args, **kwargs):
                 return self.admin_view(view)(*args, **kwargs)
-            return update_wrapper(wrapper, view)
+            return never_cache(update_wrapper(wrapper, view))
 
         # Admin-site-wide views.
         urlpatterns = patterns('',

tests/regressiontests/admin_views/tests.py

@@ -52 +52 @@
         """
         response = self.client.get('/test_admin/%s/admin_views/section/add/' % self.urlbit)
         self.failUnlessEqual(response.status_code, 200)
+    
+    def testMaxAge(self):
+        """
+        Because cache time can be set by middleware, ensure max-age is explicity 0
+        """
+        response = self.client.get('/test_admin/%s/admin_views/section/add/' % self.urlbit)
+        
+        from django.utils.cache import get_max_age
+        self.failUnlessEqual(get_max_age(response), 0)
 
     def testAddWithGETArgs(self):
         response = self.client.get('/test_admin/%s/admin_views/section/add/' % self.urlbit, {'name': 'My Section'})