diff options
| author | Sjoerd Job Postmus <sjoerdjob@sjec.nl> | 2016-02-17 15:18:24 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-02-25 19:30:37 -0500 |
| commit | 911a77fcca49a92d0750b7f7d573ea2dcf77a1a9 (patch) | |
| tree | bc4868ee2ed46a861a592d53045052049d08b50d | |
| parent | a23b387e5a1f22aad2fe0bb87c7e2bc3d065f5e7 (diff) | |
[1.9.x] Fixed #26231 -- Used .get_username in admin login template.
Backport of bbe136e1a2f9cbf3fd10d49fbe8558a5b394752c from master
| -rw-r--r-- | django/contrib/admin/templates/admin/login.html | 2 | ||||
| -rw-r--r-- | docs/releases/1.9.3.txt | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/django/contrib/admin/templates/admin/login.html b/django/contrib/admin/templates/admin/login.html index 7a0d650036..adb58d683c 100644 --- a/django/contrib/admin/templates/admin/login.html +++ b/django/contrib/admin/templates/admin/login.html @@ -34,7 +34,7 @@ {% if user.is_authenticated %} <p class="errornote"> -{% blocktrans with username=request.user.username trimmed %} +{% blocktrans with username=request.user.get_username trimmed %} You are authenticated as {{ username }}, but are not authorized to access this page. Would you like to login to a different account? {% endblocktrans %} diff --git a/docs/releases/1.9.3.txt b/docs/releases/1.9.3.txt index cd7d674864..ef95681024 100644 --- a/docs/releases/1.9.3.txt +++ b/docs/releases/1.9.3.txt @@ -42,3 +42,7 @@ Bugfixes regressed in Django 1.9 (:ticket:`26253`). * Fixed ``BoundField`` to reallow slices of subwidgets (:ticket:`26267`). + +* Changed the admin's "permission denied" message in the login template to use + ``get_username`` instead of ``username`` to support custom user models + (:ticket:`26231`). |