Django

Code

Changeset 7933

Show
Ignore:
Timestamp:
07/15/08 22:42:42 (4 months ago)
Author:
brosner
Message:

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.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin/django/contrib/admin/sites.py

    r7929 r7933  
    119119        if url == 'logout': 
    120120            return self.logout(request) 
    121  
     121         
     122        # Check permission to continue or display login form. 
    122123        if not self.has_permission(request): 
    123             response = self.login(request) 
    124             if response: 
    125                 # make sure that there is a response before returning 
    126                 # this addresses any post data that might persist from 
    127                 # expired sessions and continue through (#5999) 
    128                 return response 
     124            return self.login(request) 
    129125 
    130126        if url == '': 
    …… 
    263259                        request.POST = post_data 
    264260                        request.user = user 
    265                         return None 
     261                        return self.root(request, request.path.split(self.root_path)[-1]) 
    266262                    else: 
    267263                        request.session.delete_test_cookie() 

  • django/branches/newforms-admin/django/views/decorators/cache.py

    r7824 r7933  
    4343    def _wrapped_view_func(request, *args, **kwargs): 
    4444        response = view_func(request, *args, **kwargs) 
    45         # Although rare, it is possible for a view to return None (e.g. the 
    46         # django.contrib.admin.sites.AdminSite.login view in one corner-case) 
    47         if response: 
    48             add_never_cache_headers(response) 
     45        add_never_cache_headers(response) 
    4946        return response 
    5047    return wraps(view_func)(_wrapped_view_func)