p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #159 -- Admin users no longer have to log in to go to the 'log out' page. Thanks, Manuzhai 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@325 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2005-07-26 22:48:04 +00:00
parent 3c0c0e7317
commit fe91881e35
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/middleware/admin.py
View File

@ -3,6 +3,7 @@ from django.core import template_loader
from django.core.extensions import DjangoContext as Context from django.core.extensions import DjangoContext as Context
from django.models.auth import sessions, users from django.models.auth import sessions, users
from django.views.registration import passwords from django.views.registration import passwords
from django.views.auth.login import logout
import base64, md5 import base64, md5
import cPickle as pickle import cPickle as pickle
from django.conf.settings import SECRET_KEY from django.conf.settings import SECRET_KEY
@ -26,8 +27,9 @@ class AdminUserRequired:
# If this is the password reset view, we don't want to require login # If this is the password reset view, we don't want to require login
# Otherwise the password reset would need its own entry in the httpd # Otherwise the password reset would need its own entry in the httpd
# conf, which is a little uglier than this. # conf, which is a little uglier than this. Same goes for the logout
if view_func == passwords.password_reset or view_func == passwords.password_reset_done: # view.
if view_func in (passwords.password_reset, passwords.password_reset_done, logout):
return return
# Check for a logged in, valid user # Check for a logged in, valid user