diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2012-10-13 11:44:50 +0800 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2012-10-13 11:44:50 +0800 |
| commit | c433fcb3fb34fccd69782979f0e7cd5f2d4a4893 (patch) | |
| tree | c299347c23b2247dd814c22e2ec79258980868e0 /django/contrib/admin | |
| parent | 5fb22329a14695419f191da8b7d0b5b22793aff0 (diff) | |
Fixed #19077, #19079 -- Made USERNAME_FIELD a required field, and modified UserAdmin to match.
Diffstat (limited to 'django/contrib/admin')
3 files changed, 3 insertions, 3 deletions
diff --git a/django/contrib/admin/templates/admin/base.html b/django/contrib/admin/templates/admin/base.html index 3d2a07eba2..7bbd73a464 100644 --- a/django/contrib/admin/templates/admin/base.html +++ b/django/contrib/admin/templates/admin/base.html @@ -26,7 +26,7 @@ {% if user.is_active and user.is_staff %} <div id="user-tools"> {% trans 'Welcome,' %} - <strong>{% filter force_escape %}{% firstof user.get_short_name user.username %}{% endfilter %}</strong>. + <strong>{% filter force_escape %}{% firstof user.get_short_name user.get_username %}{% endfilter %}</strong>. {% block userlinks %} {% url 'django-admindocs-docroot' as docsroot %} {% if docsroot %} diff --git a/django/contrib/admin/templates/admin/object_history.html b/django/contrib/admin/templates/admin/object_history.html index 55dd4a3b4c..870c4648a6 100644 --- a/django/contrib/admin/templates/admin/object_history.html +++ b/django/contrib/admin/templates/admin/object_history.html @@ -29,7 +29,7 @@ {% for action in action_list %} <tr> <th scope="row">{{ action.action_time|date:"DATETIME_FORMAT" }}</th> - <td>{{ action.user.username }}{% if action.user.get_full_name %} ({{ action.user.get_full_name }}){% endif %}</td> + <td>{{ action.user.get_username }}{% if action.user.get_full_name %} ({{ action.user.get_full_name }}){% endif %}</td> <td>{{ action.change_message }}</td> </tr> {% endfor %} diff --git a/django/contrib/admin/templates/registration/password_reset_email.html b/django/contrib/admin/templates/registration/password_reset_email.html index 0eef4a7f9d..a220f12033 100644 --- a/django/contrib/admin/templates/registration/password_reset_email.html +++ b/django/contrib/admin/templates/registration/password_reset_email.html @@ -5,7 +5,7 @@ {% block reset_link %} {{ protocol }}://{{ domain }}{% url 'django.contrib.auth.views.password_reset_confirm' uidb36=uid token=token %} {% endblock %} -{% trans "Your username, in case you've forgotten:" %} {{ user.username }} +{% trans "Your username, in case you've forgotten:" %} {{ user.get_username }} {% trans "Thanks for using our site!" %} |