Make email field in user form required

lunes_cms/cms/admins/__init__.py

@@ -12,4 +12,5 @@
     "GroupAPIKeyAdmin",
     "FeedbackAdmin",
     "SponsorAdmin",
+    "UserAdmin",
 ]

lunes_cms/cms/admins/user_admin.py

@@ -0,0 +1,7 @@
+from django.contrib import admin
+
+from ..models import RegisterUserForm
+
+
+class UserAdmin(admin.ModelAdmin):
+    fields = ("password", "email", "username")

lunes_cms/cms/migrations/0010_user.py

@@ -0,0 +1,38 @@
+# Generated by Django 3.2.16 on 2023-03-07 16:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("cms", "0009_sponsor"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="User",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("password", models.CharField(max_length=128, verbose_name="password")),
+                (
+                    "last_login",
+                    models.DateTimeField(
+                        blank=True, null=True, verbose_name="last login"
+                    ),
+                ),
+                ("username", models.CharField(default="", max_length=30, unique=True)),
+                ("email", models.EmailField(default="", max_length=254)),
+            ],
+            options={
+                "abstract": False,
+            },
+        ),
+    ]

lunes_cms/cms/models/__init__.py

@@ -7,6 +7,7 @@
 from .group_api_key import GroupAPIKey
 from .feedback import Feedback
 from .sponsor import Sponsor
+from .user import User
 from . import group, content_type
 
 __all__ = [
@@ -22,4 +23,5 @@
     "GroupAPIKey",
     "Feedback",
     "Sponsor",
+    "User",
 ]

lunes_cms/cms/models/user.py

@@ -0,0 +1,28 @@
+from django.db import models
+from django.contrib.auth.models import BaseUserManager, AbstractBaseUser
+
+
+class UserManager(BaseUserManager):
+    def create_user(self, username, email, password):
+        if not email:
+            raise ValueError("_('Users must have an email address')")
+        if not password:
+            raise ValueError("_('Users must have a password')")
+        user = self.model(email=self.normalize_email(email))
+        user.set_username(username)
+        user.set_password(password)
+        user.save()
+        return user
+
+
+class User(AbstractBaseUser):
+    """
+    user model
+    """
+
+    username = models.CharField(default="", unique=True, max_length=30)
+    email = models.EmailField(default="")
+
+    USERNAME_FIELD = "username"
+    REQUIRED_FIELDS = ["email", "password"]
+    objects = UserManager()

lunes_cms/core/settings.py

@@ -183,6 +183,8 @@
     },
 ]
 
+# AUTH_USER_MODEL = 'cms.User'
+
 
 ########################
 # INTERNATIONALIZATION #

lunes_cms/locale/de/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-20 20:24+0000\n"
+"POT-Creation-Date: 2023-03-07 16:16+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -494,19 +494,19 @@ msgstr "Datei zu groß! Max. 5 MB"
 msgid "Only use one file extension!"
 msgstr "Nur maximal ein Dateityp erlaubt!"
 
-#: core/settings.py:203
+#: core/settings.py:205
 msgid "English"
 msgstr "Englisch"
 
-#: core/settings.py:204
+#: core/settings.py:206
 msgid "German"
 msgstr "Deutsch"
 
-#: core/settings.py:446 core/settings.py:447 core/settings.py:449
+#: core/settings.py:448 core/settings.py:449 core/settings.py:451
 msgid "Lunes Administration"
 msgstr "Lunes-Verwaltung"
 
-#: core/settings.py:448
+#: core/settings.py:450
 msgid "Welcome to the vocabulary management of Lunes!"
 msgstr "Willkommen bei der Vokabelverwaltung von Lunes!"