Changeset 7414

Timestamp:

04/12/08 20:50:29 (3 months ago)

Author:

mtredinnick

Message:

Updated the inline help text for User.is_active.

Fixed #6881. Refs #7011.

Files:

• django/trunk/django/contrib/auth/models.py (modified) (3 diffs)

django/trunk/django/contrib/auth/models.py

@@ -135 +135 @@
-    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."))
-can log into the Django admin
+should be treated as active
-    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)
@@ -227 +227 @@
-            if hasattr(backend, "get_all_permissions"):
-                permissions.update(backend.get_all_permissions(self))
- 
+
-
-    def has_perm(self, perm):
@@ -239 +239 @@
-        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():