diff options
| -rw-r--r-- | django/contrib/admin/sites.py | 12 | ||||
| -rw-r--r-- | django/views/decorators/cache.py | 5 |
2 files changed, 5 insertions, 12 deletions
diff --git a/django/contrib/admin/sites.py b/django/contrib/admin/sites.py index acceaa9cc5..bb4dc58ece 100644 --- a/django/contrib/admin/sites.py +++ b/django/contrib/admin/sites.py @@ -118,14 +118,10 @@ class AdminSite(object): # The 'logout' view doesn't require that the person is logged in. if url == 'logout': return self.logout(request) - + + # Check permission to continue or display 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) @@ -262,7 +258,7 @@ class AdminSite(object): # 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) diff --git a/django/views/decorators/cache.py b/django/views/decorators/cache.py index 5f2bec20be..8b620c1345 100644 --- a/django/views/decorators/cache.py +++ b/django/views/decorators/cache.py @@ -42,9 +42,6 @@ def never_cache(view_func): """ 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) |