summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-07-04 09:32:32 -0400
committerTim Graham <timograham@gmail.com>2013-07-04 09:34:02 -0400
commit23748c483b128773edb5f5e8ee509bf12732595c (patch)
treef131f194af3aa17e679e2b982d26e9e4d2a4f0fc /docs/ref
parent9687e387d80bba33f82593915bb1351ae73e54f6 (diff)
[1.6.x] Fixed #20673 -- Clarified that HttpRequest.user uses AUTH_USER_MODEL.
Thanks littlepig for the report. Backport of f407f75aae from master.
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/request-response.txt11
1 files changed, 6 insertions, 5 deletions
diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt
index 578418b4ee..7ca46dfe79 100644
--- a/docs/ref/request-response.txt
+++ b/docs/ref/request-response.txt
@@ -165,10 +165,11 @@ All attributes should be considered read-only, unless stated otherwise below.
.. attribute:: HttpRequest.user
- A ``django.contrib.auth.models.User`` object representing the currently
+ An object of type :setting:`AUTH_USER_MODEL` representing the currently
logged-in user. If the user isn't currently logged in, ``user`` will be set
- to an instance of ``django.contrib.auth.models.AnonymousUser``. You
- can tell them apart with ``is_authenticated()``, like so::
+ to an instance of :class:`django.contrib.auth.models.AnonymousUser`. You
+ can tell them apart with
+ :meth:`~django.contrib.auth.models.User.is_authenticated`, like so::
if request.user.is_authenticated():
# Do something for logged-in users.
@@ -176,8 +177,8 @@ All attributes should be considered read-only, unless stated otherwise below.
# Do something for anonymous users.
``user`` is only available if your Django installation has the
- ``AuthenticationMiddleware`` activated. For more, see
- :doc:`/topics/auth/index`.
+ :class:`~django.contrib.auth.middleware.AuthenticationMiddleware`
+ activated. For more, see :doc:`/topics/auth/index`.
.. attribute:: HttpRequest.session