Remove user states

users/models.py

@@ -14,15 +14,21 @@ from med.settings import MAX_EMPRUNT, REQ_EXPIRE_HRS
 
 
 class UserManager(BaseUserManager):
-    def _create_user(self, pseudo, name, surname, email, password=None, su=False):
-        if not pseudo:
-            raise ValueError('Users must have an username')
+    use_in_migrations = True
 
+    def _create_user(self, username, name, surname, email, password=None, su=False):
+        """
+        Creates and saves a User with the given username, email and password.
+        """
+        if not username:
+            raise ValueError('The given username must be set')
+        email = self.normalize_email(email)
+        username = self.model.normalize_username(username)
         user = self.model(
-            pseudo=pseudo,
+            pseudo=username,
             name=name,
             surname=surname,
-            email=self.normalize_email(email),
+            email=email,
         )
 
         user.set_password(password)
@@ -48,14 +54,6 @@ class UserManager(BaseUserManager):
 
 class User(AbstractBaseUser):
     PRETTY_NAME = "Utilisateurs"
-    STATE_ACTIVE = 0
-    STATE_DISABLED = 1
-    STATE_ARCHIVE = 2
-    STATES = (
-        (0, 'STATE_ACTIVE'),
-        (1, 'STATE_DISABLED'),
-        (2, 'STATE_ARCHIVE'),
-    )
 
     name = models.CharField(max_length=255)
     surname = models.CharField(max_length=255)
@@ -63,7 +61,6 @@ class User(AbstractBaseUser):
     telephone = models.CharField(max_length=15, null=True, blank=True)
     adresse = models.CharField(max_length=255, null=True, blank=True)
     maxemprunt = models.IntegerField(default=MAX_EMPRUNT, help_text="Maximum d'emprunts autorisés")
-    state = models.IntegerField(choices=STATES, default=STATE_ACTIVE)
     pseudo = models.CharField(max_length=32, unique=True,
                               help_text="Doit contenir uniquement des lettres, chiffres, ou tirets. ")
     comment = models.CharField(help_text="Commentaire, promo", max_length=255, blank=True)