Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

newforms-admin: Fixed #7553 -- Reverted [7824] in favor of a better f…

…ix in #7553. The never_cache decorator is no longer special casing None. Thanks Michael Newman for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7933 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 885ade77846f720c553e449947a2148f58e85577 1 parent 83afd39
@brosner brosner authored
Showing with 5 additions and 12 deletions.
  1. +4 −8 django/contrib/admin/sites.py
  2. +1 −4 django/views/decorators/cache.py
View
12 django/contrib/admin/sites.py
@@ -118,14 +118,10 @@ def root(self, request, url):
# 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 @@ def login(self, request):
# 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)
View
5 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)

0 comments on commit 885ade7

Please sign in to comment.
Something went wrong with that request. Please try again.