Author: brosner
Date: 2008-07-15 22:42:42 -0500 (Tue, 15 Jul 2008)
New Revision: 7933
Modified:
django/branches/newforms-admin/django/contrib/admin/sites.py
django/branches/newforms-admin/django/views/decorators/cache.py
Log:
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.
Modified: django/branches/newforms-admin/django/contrib/admin/sites.py
===================================================================
--- django/branches/newforms-admin/django/contrib/admin/sites.py
2008-07-16 02:01:18 UTC (rev 7932)
+++ django/branches/newforms-admin/django/contrib/admin/sites.py
2008-07-16 03:42:42 UTC (rev 7933)
@@ -118,14 +118,10 @@
# 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 @@
# 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)
Modified: django/branches/newforms-admin/django/views/decorators/cache.py
===================================================================
--- django/branches/newforms-admin/django/views/decorators/cache.py
2008-07-16 02:01:18 UTC (rev 7932)
+++ django/branches/newforms-admin/django/views/decorators/cache.py
2008-07-16 03:42:42 UTC (rev 7933)
@@ -42,9 +42,6 @@
"""
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)
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
