Rename surname to last_name

users/models.py

@@ -17,7 +17,7 @@ from med.settings import MAX_EMPRUNT, REQ_EXPIRE_HRS
 class UserManager(BaseUserManager):
     use_in_migrations = True
 
-    def _create_user(self, username, name, surname, email, password=None, su=False):
+    def _create_user(self, username, name, last_name, email, password=None, su=False):
         """
         Creates and saves a User with the given username, email and password.
         """
@@ -28,7 +28,7 @@ class UserManager(BaseUserManager):
         user = self.model(
             username=username,
             name=name,
-            surname=surname,
+            last_name=last_name,
             email=email,
         )
 
@@ -38,28 +38,27 @@ class UserManager(BaseUserManager):
             user.make_admin()
         return user
 
-    def create_user(self, username, name, surname, email, password=None):
+    def create_user(self, username, name, last_name, email, password=None):
         """
-        Creates and saves a User with the given username, name, surname, email,
+        Creates and saves a User with the given username, name, last_name, email,
         and password.
         """
-        return self._create_user(username, name, surname, email, password, False)
+        return self._create_user(username, name, last_name, email, password, False)
 
-    def create_superuser(self, username, name, surname, email, password):
+    def create_superuser(self, username, name, last_name, email, password):
         """
-        Creates and saves a superuser with the given username, name, surname,
+        Creates and saves a superuser with the given username, name, last_name,
         email, and password.
         """
-        return self._create_user(username, name, surname, email, password, True)
+        return self._create_user(username, name, last_name, email, password, True)
 
 
 class User(AbstractBaseUser):
     username_validator = UnicodeUsernameValidator() if six.PY3 else ASCIIUsernameValidator()
-    PRETTY_NAME = "Utilisateurs"
 
     name = models.CharField(max_length=255)
-    surname = models.CharField(max_length=255)
-    email = models.EmailField()
+    last_name = models.CharField(_('last name'), max_length=30, blank=True)
+    email = models.EmailField(_('email address'), blank=True)
     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")
@@ -87,13 +86,14 @@ class User(AbstractBaseUser):
             'Unselect this instead of deleting accounts.'
         ),
     )
-    registered = models.DateTimeField(auto_now_add=True)
-
-    USERNAME_FIELD = 'username'
-    REQUIRED_FIELDS = ['name', 'surname', 'email']
+    date_joined = models.DateTimeField(_('date joined'), default=timezone.now)
 
     objects = UserManager()
 
+    EMAIL_FIELD = 'email'
+    USERNAME_FIELD = 'username'
+    REQUIRED_FIELDS = ['name', 'last_name', 'email']
+
     @property
     def is_admin(self):
         try:
@@ -118,7 +118,7 @@ class User(AbstractBaseUser):
                 return False
 
     def get_full_name(self):
-        return '%s %s' % (self.name, self.surname)
+        return '%s %s' % (self.name, self.last_name)
 
     def get_short_name(self):
         return self.name