mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 09:49:12 +00:00
Code Issues 32 Releases Wiki Activity

newforms-admin: Fixed #7553 -- Reverted [7824] in favor of a better fix in #7553. The never_cache decorator is no longer special casing None. Thanks Michael Newman for the patch.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7933 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Brian Rosner 2008-07-16 03:42:42 +00:00
parent 83afd39b1a
commit 885ade7784
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
django/contrib/admin/sites.py
View File

@ -119,13 +119,9 @@ class AdminSite(object):
if url == 'logout': if url == 'logout':
return self.logout(request) return self.logout(request)
# Check permission to continue or display login form.
if not self.has_permission(request): if not self.has_permission(request):
response = self.login(request) return 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
if url == '': if url == '':
return self.index(request) return self.index(request)
@ -262,7 +258,7 @@ class AdminSite(object):
# overwrite request.POST with the saved post_data, and continue # overwrite request.POST with the saved post_data, and continue
request.POST = post_data request.POST = post_data
request.user = user request.user = user
return None return self.root(request, request.path.split(self.root_path)[-1])
else: else:
request.session.delete_test_cookie() request.session.delete_test_cookie()
return http.HttpResponseRedirect(request.path) return http.HttpResponseRedirect(request.path)

5
django/views/decorators/cache.py
View File

@ -42,9 +42,6 @@ def never_cache(view_func):
""" """
def _wrapped_view_func(request, *args, **kwargs): def _wrapped_view_func(request, *args, **kwargs):
response = 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 add_never_cache_headers(response)
# django.contrib.admin.sites.AdminSite.login view in one corner-case)
if response:
add_never_cache_headers(response)
return response return response
return wraps(view_func)(_wrapped_view_func) return wraps(view_func)(_wrapped_view_func)