Ticket #7553: 7553-sites-decorators-ref.2.diff

django/views/decorators/cache.py

@@ -42 +42 @@
     """
     def _wrapped_view_func(request, *args, **kwargs):
         response = view_func(request, *args, **kwargs)
-        # Although rare, it is possible for a view to return None (e.g. the
-        # django.contrib.admin.sites.AdminSite.login view in one corner-case)
-        if response:
-            add_never_cache_headers(response)
+        add_never_cache_headers(response)
         return response
     return wraps(view_func)(_wrapped_view_func)

django/contrib/admin/sites.py

@@ -118 +118 @@
         # The 'logout' view doesn't require that the person is logged in.
         if url == 'logout':
             return self.logout(request)
-
+        
+        # Check for permission or show login form 
         if not self.has_permission(request):
-            response = self.login(request)
-            if response:
-                # make sure that there is a response before returning
-                # this addresses any post data that might persist from
-                # expired sessions and continue through (#5999)
-                return response
+            return self.login(request)
 
         if url == '':
             return self.index(request)
@@ -257 +253 @@
                 user.last_login = datetime.datetime.now()
                 user.save()
                 if request.POST.has_key('post_data'):
+                    request.session.delete_test_cookie()
                     post_data = _decode_post_data(request.POST['post_data'])
                     if post_data and not post_data.has_key(LOGIN_FORM_KEY):
                         # overwrite request.POST with the saved post_data, and continue
                         request.POST = post_data
                         request.user = user
-                        return None
+                        return self.root(request, request.path.split(self.root_path)[-1])
                     else:
-                        request.session.delete_test_cookie()
                         return http.HttpResponseRedirect(request.path)
             else:
                 return self.display_login_form(request, ERROR_MESSAGE)