test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplified control flow for change made in r7535 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7536 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Luke Plant 2008-05-16 22:53:39 +00:00
parent 7e4718f8d5
commit 6f76b9f58d
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
django/contrib/admin/views/decorators.py
View File

@ -84,18 +84,13 @@ def staff_member_required(view_func):
message = ERROR_MESSAGE
if '@' in username:
# Mistakenly entered e-mail address instead of username? Look it up.
try:
users = list(User.objects.filter(email=username))
if len(users) == 1:
user = users[0]
else:
# Either we cannot find the user, or if more than 1
# we cannot guess which user is the correct one.
raise User.DoesNotExist()
except User.DoesNotExist:
message = _("Usernames cannot contain the '@' character.")
users = list(User.objects.filter(email=username))
if len(users) == 1:
message = _("Your e-mail address is not your username. Try '%s' instead.") % users[0].username
else:
message = _("Your e-mail address is not your username. Try '%s' instead.") % user.username
# Either we cannot find the user, or if more than 1
# we cannot guess which user is the correct one.
message = _("Usernames cannot contain the '@' character.")
return _display_login_form(request, message)
# The user data is correct; log in the user in and continue.