Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.2.X] Fixed #8342 -- Removed code from the admin that assumed that …

…you can't login with an email address (nixed by r12634).

Backport from trunk (r14769).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14773 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit a607d9d34546a4ff9313d431e275ed0bf365d42a 1 parent 1155b49
@jezdez jezdez authored
View
4 django/contrib/admin/sites.py
@@ -327,13 +327,11 @@ def login(self, request):
try:
user = User.objects.get(email=username)
except (User.DoesNotExist, User.MultipleObjectsReturned):
- message = _("Usernames cannot contain the '@' character.")
+ pass
else:
if user.check_password(password):
message = _("Your e-mail address is not your username."
" Try '%s' instead.") % user.username
- else:
- message = _("Usernames cannot contain the '@' character.")
return self.display_login_form(request, message)
# The user data is correct; log in the user in and continue.
View
4 django/contrib/admin/views/decorators.py
@@ -60,10 +60,6 @@ def _checklogin(request, *args, **kwargs):
users = list(User.objects.filter(email=username))
if len(users) == 1 and users[0].check_password(password):
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.
- message = _("Usernames cannot contain the '@' character.")
return _display_login_form(request, message)
# The user data is correct; log in the user in and continue.
View
8 tests/regressiontests/admin_views/tests.py
@@ -453,12 +453,12 @@ def testLogin(self):
self.assertContains(login, "Your e-mail address is not your username")
# only correct passwords get a username hint
login = self.client.post('/test_admin/admin/', self.super_email_bad_login)
- self.assertContains(login, "Usernames cannot contain the '@' character")
+ self.assertContains(login, "Please enter a correct username and password")
new_user = User(username='jondoe', password='secret', email='super@example.com')
new_user.save()
# check to ensure if there are multiple e-mail addresses a user doesn't get a 500
login = self.client.post('/test_admin/admin/', self.super_email_login)
- self.assertContains(login, "Usernames cannot contain the '@' character")
+ self.assertContains(login, "Please enter a correct username and password")
# Add User
request = self.client.get('/test_admin/admin/')
@@ -962,12 +962,12 @@ def test_staff_member_required_decorator_works_as_per_admin_login(self):
self.assertContains(login, "Your e-mail address is not your username")
# only correct passwords get a username hint
login = self.client.post('/test_admin/admin/secure-view/', self.super_email_bad_login)
- self.assertContains(login, "Usernames cannot contain the '@' character")
+ self.assertContains(login, "Please enter a correct username and password")
new_user = User(username='jondoe', password='secret', email='super@example.com')
new_user.save()
# check to ensure if there are multiple e-mail addresses a user doesn't get a 500
login = self.client.post('/test_admin/admin/secure-view/', self.super_email_login)
- self.assertContains(login, "Usernames cannot contain the '@' character")
+ self.assertContains(login, "Please enter a correct username and password")
# Add User
request = self.client.get('/test_admin/admin/secure-view/')
Please sign in to comment.
Something went wrong with that request. Please try again.