Commit 6f76b9f5 authored by Luke Plant's avatar Luke Plant
Browse files

Simplified control flow for change made in r7535 


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7536 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 7e4718f8

django/contrib/admin/views/decorators.py

+6 −11
Original line number Diff line number Diff line
@@ -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]

                    message = _("Your e-mail address is not your username. Try '%s' instead.") % users[0].username

                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.")

                else:

                    message = _("Your e-mail address is not your username. Try '%s' instead.") % user.username

            return _display_login_form(request, message)



        # The user data is correct; log in the user in and continue.