Commit e3bc2590 authored by Paul McMillan's avatar Paul McMillan
Browse files

[1.3.X] Reverting r16878 (improved admin error message) per advice from jezdez. refs #16837 


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.3.X@16891 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent ed156a44

django/contrib/admin/forms.py

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ from django.contrib.auth.models import User 


from django.utils.translation import ugettext_lazy, ugettext as _



ERROR_MESSAGE = ugettext_lazy("Please enter the correct username and password "

        "for a staff account. Note that both fields are case-sensitive.")

ERROR_MESSAGE = ugettext_lazy("Please enter a correct username and password. "

                              "Note that both fields are case-sensitive.")



class AdminAuthenticationForm(AuthenticationForm):

    """

tests/regressiontests/admin_views/tests.py

+6 −9
Original line number Diff line number Diff line
@@ -38,9 +38,6 @@ from models import (Article, BarAccount, CustomArticle, EmptyModel, 
    Question, Answer, Inquisition, Actor, FoodDelivery,

    RowLevelChangePermissionModel, Paper, CoverLetter, Story, OtherStory)



ERROR_MESSAGE = "Please enter the correct username and password \

for a staff account. Note that both fields are case-sensitive."





class AdminViewBasicTest(TestCase):

    fixtures = ['admin-views-users.xml', 'admin-views-colors.xml',
@@ -641,12 +638,12 @@ class AdminViewPermissionsTest(TestCase): 
        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, ERROR_MESSAGE)

        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, ERROR_MESSAGE)

        self.assertContains(login, "Please enter a correct username and password.")



        # Add User

        request = self.client.get('/test_admin/admin/')
@@ -677,7 +674,7 @@ class AdminViewPermissionsTest(TestCase): 
        self.assertEqual(request.status_code, 200)

        login = self.client.post('/test_admin/admin/', self.joepublic_login)

        self.assertEqual(login.status_code, 200)

        self.assertContains(login, ERROR_MESSAGE)

        self.assertContains(login, "Please enter a correct username and password.")



        # Requests without username should not return 500 errors.

        request = self.client.get('/test_admin/admin/')
@@ -1237,12 +1234,12 @@ class SecureViewTests(TestCase): 
        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, ERROR_MESSAGE)

        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, ERROR_MESSAGE)

        self.assertContains(login, "Please enter a correct username and password.")



        # Add User

        request = self.client.get('/test_admin/admin/secure-view/')
@@ -1274,7 +1271,7 @@ class SecureViewTests(TestCase): 
        login = self.client.post('/test_admin/admin/secure-view/', self.joepublic_login)

        self.assertEqual(login.status_code, 200)

        # Login.context is a list of context dicts we just need to check the first one.

        self.assertContains(login, ERROR_MESSAGE)

        self.assertContains(login, "Please enter a correct username and password.")



        # 8509 - if a normal user is already logged in, it is possible

        # to change user into the superuser without error