Translate borrows

users/admin.py

@@ -12,7 +12,6 @@ from django.utils.translation import ugettext_lazy as _
 from reversion.admin import VersionAdmin
 from med.admin import admin_site
 
-from .forms import UserCreationAdminForm
 from .models import User
 
 
@@ -35,28 +34,17 @@ class UserAdmin(VersionAdmin, BaseUserAdmin):
     fieldsets = (
         (None, {'fields': ('username', 'password')}),
         (_('Personal info'), {'fields': ('first_name', 'last_name', 'email',
-                                         'telephone', 'address', 'comment')}),
+                                         'phone_number', 'address',
+                                         'comment')}),
         (_('Permissions'), {'fields': ('is_active', 'is_staff', 'is_superuser',
-                                       'groups', 'user_permissions',
-                                       'maxemprunt')}),
+                                       'groups', 'user_permissions')}),
         (_('Important dates'), {'fields': ('last_login', 'date_joined')}),
     )
     list_display = ('username', 'email', 'first_name', 'last_name',
-                    'maxemprunt', 'is_member', 'is_staff')
+                    'is_member', 'is_staff')
     list_filter = (IsMemberFilter, 'is_staff', 'is_superuser', 'is_active',
                    'groups')
 
-    # Customize required initial fields
-    add_form_template = 'admin/change_form.html'
-    add_form = UserCreationAdminForm
-    add_fieldsets = (
-        (None, {
-            'classes': ('wide',),
-            'fields': ("username", "email", "first_name", "last_name",
-                       "address", "telephone"),
-        }),
-    )
-
     def save_model(self, request, obj, form, change):
         """
         On creation, send a password init mail

users/forms.py

@@ -1,57 +0,0 @@
-# -*- mode: python; coding: utf-8 -*-
-# Copyright (C) 2017-2019 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from django import forms
-from django.contrib.auth.forms import UsernameField
-from django.core.validators import MinLengthValidator
-from django.forms import ModelForm
-
-from .models import User
-
-
-class PassForm(forms.Form):
-    passwd1 = forms.CharField(
-        label=u'Nouveau mot de passe',
-        max_length=255,
-        validators=[MinLengthValidator(8)],
-        widget=forms.PasswordInput,
-    )
-    passwd2 = forms.CharField(
-        label=u'Saisir à nouveau le mot de passe',
-        max_length=255,
-        validators=[MinLengthValidator(8)],
-        widget=forms.PasswordInput
-    )
-
-
-class BaseInfoForm(ModelForm):
-    class Meta:
-        model = User
-        fields = [
-            'username',
-            'email',
-            'first_name',
-            'last_name',
-            'address',
-            'telephone',
-        ]
-
-
-class UserCreationAdminForm(ModelForm):
-    """
-    A form that creates a user, with no privileges,
-    from the given information.
-    """
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields['email'].required = True
-        self.fields['first_name'].required = True
-        self.fields['last_name'].required = True
-
-    class Meta:
-        model = User
-        fields = ("username", "email", "first_name", "last_name", "address",
-                  "telephone")
-        field_classes = {'username': UsernameField}

users/migrations/0045_auto_20211114_1423.py

@@ -0,0 +1,22 @@
+# Generated by Django 2.2.24 on 2021-11-14 13:23
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0044_membership'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='user',
+            old_name='telephone',
+            new_name='phone_number',
+        ),
+        migrations.RemoveField(
+            model_name='user',
+            name='maxemprunt',
+        ),
+    ]

users/models.py

@@ -1,5 +1,5 @@
 # -*- mode: python; coding: utf-8 -*-
-# Copyright (C) 2017-2019 by BDE ENS Paris-Saclay
+# Copyright (C) 2017-2021 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from datetime import datetime
@@ -12,11 +12,10 @@ from django.db import models
 from django.db.models import Q
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
-from med.settings import MAX_EMPRUNT
 
 
 class User(AbstractUser):
-    telephone = models.CharField(
+    phone_number = models.CharField(
         verbose_name=_('phone number'),
         max_length=15,
         blank=True,
@@ -26,12 +25,6 @@ class User(AbstractUser):
         max_length=255,
         blank=True,
     )
-    maxemprunt = models.IntegerField(
-        verbose_name=_('maximum borrowed'),
-        help_text=_('Maximal amount of simultaneous borrowed item '
-                    'authorized.'),
-        default=MAX_EMPRUNT,
-    )
     comment = models.CharField(
         verbose_name=_('comment'),
         help_text=_('Promotion...'),
@@ -39,7 +32,7 @@ class User(AbstractUser):
         blank=True,
     )
     date_joined = models.DateTimeField(
-        _('date joined'),
+        verbose_name=_('date joined'),
         default=timezone.now,
         null=True,
     )
@@ -69,7 +62,7 @@ class User(AbstractUser):
         self.email = data['email']
         self.first_name = data['first_name']
         self.last_name = data['last_name']
-        self.telephone = data['profile']['phone_number']
+        self.phone_number = data['profile']['phone_number']
         self.address = data['profile']['address']
         self.comment = data['profile']['section']
 

users/serializers.py

@@ -8,7 +8,7 @@ class UserSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = User
         fields = ['url', 'username', 'first_name', 'last_name', 'email',
-                  'groups', 'telephone', 'address', 'maxemprunt', 'comment',
+                  'groups', 'phone_number', 'address', 'comment',
                   'date_joined']