Set mail address as nullable

Update admin form
Project-OSmOSE · Jan 17, 2024 · dd00cea · dd00cea
1 parent 48b1419
commit dd00cea
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 7 deletions.
diff --git a/backend/osmosewebsite/admin/team_member.py b/backend/osmosewebsite/admin/team_member.py
@@ -16,7 +16,6 @@ class TeamMemberAdmin(ModelAdmin):
         "lastname",
         "firstname",
         "position",
-        "mail_address",
         "is_former_member",
         "level",
     ]
@@ -29,7 +28,6 @@ class TeamMemberAdmin(ModelAdmin):
                     "lastname",
                     "firstname",
                     "position",
-                    "mail_address",
                     "picture",
                     "biography",
                     "is_former_member",
@@ -38,9 +36,10 @@ class TeamMemberAdmin(ModelAdmin):
             },
         ),
         (
-            "Links",
+            "Email & Links",
             {
                 "fields": [
+                    "mail_address",
                     "research_gate_url",
                     "personal_website_url",
                     "github_url",

diff --git a/backend/osmosewebsite/management/commands/seed.py b/backend/osmosewebsite/management/commands/seed.py
@@ -61,7 +61,7 @@ def _create_team_members(self):
                 position=profile["job"],
                 biography="\n".join(fake.paragraphs(5)),
                 picture=f"https://api.dicebear.com/7.x/identicon/svg?seed={profile['name']}",
-                mail_address=profile["mail"],
+                mail_address=profile["mail"] if random.randint(0, 1) > 0 else None,
                 research_gate_url=websites[0] if len(websites) > 0 else None,
                 personal_website_url=websites[1] if len(websites) > 1 else None,
                 github_url=websites[2] if len(websites) > 2 else None,
@@ -76,7 +76,7 @@ def _create_team_members(self):
                 position=profile["job"],
                 biography="\n".join(fake.paragraphs(5)),
                 picture=f"https://api.dicebear.com/7.x/identicon/svg?seed={profile['name']}",
-                mail_address=profile["mail"],
+                mail_address=profile["mail"] if random.randint(0, 1) > 0 else None,
                 research_gate_url=websites[0] if len(websites) > 0 else None,
                 personal_website_url=websites[1] if len(websites) > 1 else None,
                 github_url=websites[2] if len(websites) > 2 else None,

diff --git a/backend/osmosewebsite/migrations/0016_alter_teammember_mail_address.py b/backend/osmosewebsite/migrations/0016_alter_teammember_mail_address.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.23 on 2024-01-17 11:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('osmosewebsite', '0015_merge_20240108_1547'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='teammember',
+            name='mail_address',
+            field=models.EmailField(blank=True, max_length=254, null=True, verbose_name='Mail address'),
+        ),
+    ]
diff --git a/backend/osmosewebsite/models/team_member.py b/backend/osmosewebsite/models/team_member.py
@@ -13,7 +13,7 @@ class TeamMember(models.Model):
     biography = models.TextField()
     picture = models.URLField()
 
-    mail_address = models.EmailField("Mail address")
+    mail_address = models.EmailField("Mail address", blank=True, null=True)
     research_gate_url = models.URLField("Research Gate URL", blank=True, null=True)
     personal_website_url = models.URLField(
         "Personal website URL", blank=True, null=True

diff --git a/website/src/models/team.ts b/website/src/models/team.ts
@@ -7,7 +7,7 @@ export interface TeamMember {
     biography: string;
     picture: string;
 
-    mail_address: string;
+    mail_address?: string;
 
     research_gate_url?: string;
     personal_website_url?: string;