diff --git a/aleksis/apps/ticdesk/forms.py b/aleksis/apps/ticdesk/forms.py index 28845805f9c9d98af900ce911292cd9802785b41..a6fb00a6b15157171a89718938cb5c0f335f8df8 100644 --- a/aleksis/apps/ticdesk/forms.py +++ b/aleksis/apps/ticdesk/forms.py @@ -495,38 +495,3 @@ class EditFeedbackAspectForm(forms.ModelForm): class Meta: model = FeedbackAspect exclude = [] - - -# FIXME: Workaroung for https://edugit.org/AlekSIS/official/AlekSIS-Core/-/issues/331 -class RegisterForm(ExtensibleForm): - - layout = Layout( - Fieldset(_("General information"), Row("first_name", "last_name"), "date_of_birth",), - Fieldset(_("Contact details"), "email"), - Fieldset(_("User details"), "username", Row("password1", "password2")), - Fieldset(_("Declaration of consent"), Row("accept_terms", "accept_data"),), - ) - - class Meta: - model = Person - fields = ["first_name", "last_name", "date_of_birth", "email"] - - username = forms.CharField(label=_("Username"), required=True) - password1 = forms.CharField(label=_("Password"), widget=forms.PasswordInput) - password2 = forms.CharField(label=_("Confirm password"), widget=forms.PasswordInput) - - accept_terms = forms.BooleanField( - label=_("Ich habe die Nutzungsbedingungen gelesen und stimme ihnen zu."), - help_text=_( - "Bitte lies die <a href='https://www.teckids.org/de/kleingedrucktes/nutzungsbedingungen/'>Nutzungsbedingungen</a> aufmerksam durch!" - ), - required=True, - ) - accept_data = forms.BooleanField( - label=_( - "Ich habe die Hinweise zur Verarbeitung meiner Daten gelesen und stimme diesen zu. " - ), - help_text=_( - "Ich bin mit der in den erklärten Verarbeitung meiner Daten einverstanden und alle angegebenen Daten sind richtig. Falls ich jünger als 16 Jahre bin, sind meine Eltern hiermit ebenfalls einverstanden und ich kann dies, auf Anfrage, nachweisen (z.B. durch Herstellung eines Kontakts zu meinen Eltern).<a href='https://www.teckids.org/kleingedrucktes/nutzungsbedingungen/'>Nutzungsbedingungen</a>" - ), - ) diff --git a/aleksis/apps/ticdesk/views.py b/aleksis/apps/ticdesk/views.py index c76dd1dffb6fc08bbfc988f00c6e422b30679b5b..4247c42e718179e16b6fc5c73f00e0e0b46526b6 100644 --- a/aleksis/apps/ticdesk/views.py +++ b/aleksis/apps/ticdesk/views.py @@ -31,7 +31,6 @@ from .forms import ( EventFeedbackForm, GenerateListForm, RegisterEventForm, - RegisterForm, ) from .models import EventRegistration, FeedbackAspect, TeckidsEvent, TeckidsMember, Voucher from .tables import ( @@ -621,43 +620,3 @@ def edit_feedback_aspect(request: HttpRequest, id_: Optional[int] = None) -> Htt context["edit_feedback_aspect_form"] = edit_feedback_aspect_form return render(request, "ticdesk/feedback_aspect/edit.html", context) - - -@login_required -def register(request): - context = {} - - register_form = RegisterForm() - - if request.method == "POST": - if register_form.is_valid(): - user = User.objects.create( - username=register_form.cleaned_data["username"], - email=register_form.cleaned_data["email"], - password=register_form.cleaned_data["password2"], - ) - person = Person.objects.create( - first_name=register_form.cleaned_data["first_name"], - last_name=register_form.cleaned_data["last_name"], - date_of_birth=register_form.cleaned_data["date_of_birth"], - email=register_form.cleaned_data["email"], - user=user, - ) - context["person"] = person - context["user"] = user - - send_templated_mail( - template_name="account_registered", - from_email=lazy_preference("mail", "address"), - recipient_list=["root@teckids.org", person.email], - headers={"reply_to": [request.person.email,],}, - context=context, - ) - - # Set success - messages.success(request, _("Account successfully registered")) - return redirect("login") - - context["register_form"] = register_form - - return render(request, "ticdesk/register.html", context)