make existing users approve CGU after login

core/views/forms.py

@@ -30,9 +30,7 @@ from django import forms
 from django.conf import settings
 from django.contrib.auth.forms import AuthenticationForm, UserCreationForm
 from django.contrib.auth.models import Permission
-from django.contrib.staticfiles.management.commands.collectstatic import (
-    staticfiles_storage,
-)
+from django.contrib.staticfiles.storage import staticfiles_storage
 from django.core.exceptions import ValidationError
 from django.db import transaction
 from django.forms import (
@@ -43,6 +41,7 @@ from django.forms import (
     Widget,
 )
 from django.urls import reverse
+from django.utils.functional import lazy
 from django.utils.safestring import mark_safe
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
@@ -110,6 +109,34 @@ class FutureDateTimeField(forms.DateTimeField):
         return {"min": widget.format_value(now())}
 
 
+class CGUApprovalField(forms.BooleanField):
+    cgu_file_id = settings.SITH_CGU_FILE_ID
+    default_error_messages = {"required": _("You must approve the terms of service.")}
+    __label = None
+
+    def __init__(self, *, label_suffix: str | None = "", **kwargs):
+        # Because the core app of the sith is so huge,
+        # and because we require a url from the latter,
+        # putting the reverse into the __init__ will result in it
+        # being evaluated at server startup time (even with reverse_lazy).
+        # This will result in a circular import.
+        # Thus, we must keep the label in its own property and force it to be lazy.
+        kwargs["label"] = lazy(self.get_label, str)
+        kwargs["required"] = True
+        super().__init__(label_suffix=label_suffix, **kwargs)
+
+    def get_label(self):
+        if not self.__label:
+            self.__label = mark_safe(
+                _(
+                    "I have read and I approve the "
+                    '<a href="%(url)s" target="_blank">Terms of Service</a>'
+                )
+                % {"url": reverse("core:page", kwargs={"page_name": self.cgu_file_id})}
+            )
+        return self.__label
+
+
 # Forms
 
 
@@ -149,23 +176,14 @@ class RegisteringForm(UserCreationForm):
     class Meta:
         model = User
         fields = ("first_name", "last_name", "email", "cgu_approved")
-        field_classes = {"email": AntiSpamEmailField}
+        field_classes = {"email": AntiSpamEmailField, "cgu_approved": CGUApprovalField}
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields["cgu_approved"].required = True
-        self.fields["cgu_approved"].label_suffix = ""
-        self.fields["cgu_approved"].label = mark_safe(
-            _(
-                "I have read and I approve the "
-                '<a href="%(url)s" target="_blank">End User License Agreement</a>'
-            )
-            % {
-                "url": reverse(
-                    "core:download", kwargs={"file_id": settings.SITH_CGU_FILE_ID}
-                )
-            }
-        )
+
+class CGUApprovalForm(forms.ModelForm):
+    class Meta:
+        model = User
+        fields = ["cgu_approved"]
+        field_classes = {"cgu_approved": CGUApprovalField}
 
 
 class UserProfileForm(forms.ModelForm):