Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updated the inline help text for User.is_active.

Fixed #6881. Refs #7011.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 6dfe245f02d62ade0aa1135893e0f074de4e8eb1 1 parent 939d9e1
@malcolmt malcolmt authored
Showing with 4 additions and 4 deletions.
  1. +4 −4 django/contrib/auth/models.py
View
8 django/contrib/auth/models.py
@@ -134,7 +134,7 @@ class User(models.Model):
email = models.EmailField(_('e-mail address'), blank=True)
password = models.CharField(_('password'), max_length=128, help_text=_("Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change password form</a>."))
is_staff = models.BooleanField(_('staff status'), default=False, help_text=_("Designates whether the user can log into this admin site."))
- is_active = models.BooleanField(_('active'), default=True, help_text=_("Designates whether this user can log into the Django admin. Unselect this instead of deleting accounts."))
+ is_active = models.BooleanField(_('active'), default=True, help_text=_("Designates whether this user should be treated as active. Unselect this instead of deleting accounts."))
is_superuser = models.BooleanField(_('superuser status'), default=False, help_text=_("Designates that this user has all permissions without explicitly assigning them."))
last_login = models.DateTimeField(_('last login'), default=datetime.datetime.now)
date_joined = models.DateTimeField(_('date joined'), default=datetime.datetime.now)
@@ -226,7 +226,7 @@ def get_all_permissions(self):
for backend in auth.get_backends():
if hasattr(backend, "get_all_permissions"):
permissions.update(backend.get_all_permissions(self))
- return permissions
+ return permissions
def has_perm(self, perm):
"""
@@ -238,11 +238,11 @@ def has_perm(self, perm):
# Inactive users have no permissions.
if not self.is_active:
return False
-
+
# Superusers have all permissions.
if self.is_superuser:
return True
-
+
# Otherwise we need to check the backends.
for backend in auth.get_backends():
if hasattr(backend, "has_perm"):

0 comments on commit 6dfe245

Please sign in to comment.
Something went wrong with that request. Please try again.