Fixed #8342 -- Removed code from the admin that assumed that you can't login with an email address (nixed by r12634). Also refactored login code slightly to be DRY by using more of auth app's forms and views.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14769 bcc190cf-cafb-0310-a4f2-bffc1f526a37

3 files changed, 41 insertions, 0 deletions

diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index 89478df65b..15a5ba2c55 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -1459,6 +1459,13 @@ Path to a custom template that will be used by the admin site main index view.
 
 Path to a custom template that will be used by the admin site login view.
 
+.. versionadded:: 1.3
+
+.. attribute:: AdminSite.login_form
+
+Subclass of :class:`~django.contrib.auth.forms.AuthenticationForm` that will
+be used by the admin site login view.
+
 .. attribute:: AdminSite.logout_template
 
 .. versionadded:: 1.2
diff --git a/docs/releases/1.3-alpha-2.txt b/docs/releases/1.3-alpha-2.txt
index 3403c6e8d9..0572bc14df 100644
--- a/docs/releases/1.3-alpha-2.txt
+++ b/docs/releases/1.3-alpha-2.txt
@@ -95,6 +95,23 @@ As a result, we took the following steps to rectify the issue:
     **if the value is not None**, and falls back to the previously used
     :setting:`MEDIA_URL` setting otherwise.
 
+Changes to the login methods of the admin
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In previous version the admin app defined login methods in multiple locations
+and ignored the almost identical implementation in the already used auth app.
+A side effect of this duplication was the missing adoption of the changes made
+in r12634_ to support a broader set of characters for usernames.
+
+This release refactores the admin's login mechanism to use a subclass of the
+:class:`~django.contrib.auth.forms.AuthenticationForm` instead of a manual
+form validation. The previously undocumented method
+``'django.contrib.admin.sites.AdminSite.display_login_form'`` has been removed
+in favor of a new :attr:`~django.contrib.admin.AdminSite.login_form`
+attribute.
+
+.. _r12634: http://code.djangoproject.com/changeset/12634
+
 The Django 1.3 roadmap
 ======================
 
diff --git a/docs/releases/1.3.txt b/docs/releases/1.3.txt
index 1dc6870496..4e01fca972 100644
--- a/docs/releases/1.3.txt
+++ b/docs/releases/1.3.txt
@@ -424,3 +424,20 @@ Django 1.5, the old behavior will be replaced with the new behavior.
 To ensure compatibility with future versions of Django, existing
 templates should be modified to use the new ``future`` libraries and
 syntax.
+
+Changes to the login methods of the admin
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In previous version the admin app defined login methods in multiple locations
+and ignored the almost identical implementation in the already used auth app.
+A side effect of this duplication was the missing adoption of the changes made
+in r12634_ to support a broader set of characters for usernames.
+
+This release refactores the admin's login mechanism to use a subclass of the
+:class:`~django.contrib.auth.forms.AuthenticationForm` instead of a manual
+form validation. The previously undocumented method
+``'django.contrib.admin.sites.AdminSite.display_login_form'`` has been removed
+in favor of a new :attr:`~django.contrib.admin.AdminSite.login_form`
+attribute.
+
+.. _r12634: http://code.djangoproject.com/changeset/12634