Commit 6dfe245f authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
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
parent 939d9e1b

django/contrib/auth/models.py

+4 −4
Original line number Diff line number Diff line
@@ -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)