summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSjoerd Job Postmus <sjoerdjob@sjec.nl>2016-02-17 15:18:24 +0100
committerTim Graham <timograham@gmail.com>2016-02-25 19:29:53 -0500
commitbbe136e1a2f9cbf3fd10d49fbe8558a5b394752c (patch)
treec55caa0c4bbd75f9b5bd3909063b335a3559ae58
parentee69789f4546cc07b4ea85d03eb5bb6261673198 (diff)
Fixed #26231 -- Used .get_username in admin login template.
-rw-r--r--django/contrib/admin/templates/admin/login.html2
-rw-r--r--docs/releases/1.9.3.txt4
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 a955c871f7..4c0dc63dcf 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`).