From dd026e6a261311d785ca0a3ca9589af0328f80ca Mon Sep 17 00:00:00 2001
From: Helge Jung <hej@c3pb.de>
Date: Thu, 21 Dec 2023 22:38:56 +0100
Subject: [PATCH] remove obsolete PlatformUser.accepted_speakersagreement
---
src/core/admin.py | 1 -
src/core/locale/de/LC_MESSAGES/django.po | 6 ------
src/core/locale/en/LC_MESSAGES/django.po | 6 ------
src/core/models/users.py | 5 -----
4 files changed, 18 deletions(-)
diff --git a/src/core/admin.py b/src/core/admin.py
index 5ef0c587c..48eeed926 100644
--- a/src/core/admin.py
+++ b/src/core/admin.py
@@ -159,7 +159,6 @@ class PlatformUserAdmin(UserAdmin):
fieldsets = (
(None, {'fields': ('username', 'slug', 'password', 'user_type', 'timezone')}),
('Personal info', {'fields': ('first_name', 'last_name', 'email')}),
- ('Legal stuff', {'fields': ('accepted_speakersagreement',)}),
('Self Portrayal', {'fields': (('pronouns', 'show_name'), ('status', 'status_public'), ('avatar_url', 'avatar_config'))}),
('Accessibility', {'fields': ('theme', 'no_animations', 'colorblind', 'high_contrast', 'tag_ignorelist')}),
('Disturbance Settings', {'fields': ('receive_dms', 'receive_dm_images', 'receive_audio', 'receive_video', 'autoaccept_contacts')}),
diff --git a/src/core/locale/de/LC_MESSAGES/django.po b/src/core/locale/de/LC_MESSAGES/django.po
index 4a88a6e24..dcf44fd94 100644
--- a/src/core/locale/de/LC_MESSAGES/django.po
+++ b/src/core/locale/de/LC_MESSAGES/django.po
@@ -1947,12 +1947,6 @@ msgstr "Art des Benutzers"
msgid "PlatformUser__type"
msgstr "Typ"
-msgid "PlatformUser__accepted_speakersagreement__help"
-msgstr "Nutzer hat das Speaker's Agreement unterzeichnet"
-
-msgid "PlatformUser__accepted_speakersagreement"
-msgstr "Speaker's Agreement"
-
msgid "PlatformUser__show_name__help"
msgstr "soll der Nutzername überhaupt angezeigt werden"
diff --git a/src/core/locale/en/LC_MESSAGES/django.po b/src/core/locale/en/LC_MESSAGES/django.po
index 874aa908c..7334f860c 100644
--- a/src/core/locale/en/LC_MESSAGES/django.po
+++ b/src/core/locale/en/LC_MESSAGES/django.po
@@ -1945,12 +1945,6 @@ msgstr "type of the user"
msgid "PlatformUser__type"
msgstr "type"
-msgid "PlatformUser__accepted_speakersagreement__help"
-msgstr "the user has accepted the speaker's agreement"
-
-msgid "PlatformUser__accepted_speakersagreement"
-msgstr "speaker's agreement"
-
msgid "PlatformUser__show_name__help"
msgstr "select whether a name shall be shown at all"
diff --git a/src/core/models/users.py b/src/core/models/users.py
index 5501b65eb..ad0d8f576 100644
--- a/src/core/models/users.py
+++ b/src/core/models/users.py
@@ -48,12 +48,7 @@ class PlatformUser(AbstractUser):
)
uuid = models.UUIDField(default=uuid4, unique=True)
-
slug = models.SlugField(blank=False, unique=True)
- # legal stuff
- accepted_speakersagreement = models.BooleanField(
- null=True, help_text=_('PlatformUser__accepted_speakersagreement__help'), verbose_name=_('PlatformUser__accepted_speakersagreement')
- )
# self portrayal
show_name = models.BooleanField(null=True, help_text=_('PlatformUser__show_name__help'), verbose_name=_('PlatformUser__show_name'))
--
GitLab