From 48d10ec75cdc22abec6fa3e92ed8b9fea20998b5 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Tue, 1 Mar 2022 15:34:20 +0100
Subject: [PATCH] Reformat and cleanup code
---
aleksis/apps/paweljong/forms.py | 11 ++++++++---
aleksis/apps/paweljong/urls.py | 12 ++++++++++--
aleksis/apps/paweljong/views.py | 4 +++-
3 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/aleksis/apps/paweljong/forms.py b/aleksis/apps/paweljong/forms.py
index 8acc84a..2d38289 100644
--- a/aleksis/apps/paweljong/forms.py
+++ b/aleksis/apps/paweljong/forms.py
@@ -313,6 +313,7 @@ class RegisterEventAdditional(ExtensibleForm):
self.add_node_to_layout(node)
self.__class__.layout_filled = True
+
class RegisterEventFinancial(ExtensibleForm):
"""Form to register for an event."""
@@ -385,7 +386,9 @@ class RegisterEventConsent(ExtensibleForm):
label=_(
"I confirm that the retraction of the registration is not possible anymore "
"after {}"
- ).format(dateformat.format(event.date_retraction, formats.get_format('DATE_FORMAT'))),
+ ).format(
+ dateformat.format(event.date_retraction, formats.get_format("DATE_FORMAT"))
+ ),
)
self.fields["retraction_deadline"] = field_instance
node = Row("retraction_deadline")
@@ -446,8 +449,10 @@ class RegisterEventAccount(SignupForm, ExtensibleForm):
last_name = forms.CharField(label=_("Last name"))
date_of_birth = forms.DateField(label=_("Date of birth"))
-
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
- self.fields["username"].help_text = _("The username must only contain lower case letters and numbers, and must begin with a letter.")
+ self.fields["username"].help_text = _(
+ "The username must only contain lower case letters and numbers, "
+ "and must begin with a letter."
+ )
diff --git a/aleksis/apps/paweljong/urls.py b/aleksis/apps/paweljong/urls.py
index c765dcf..0be09df 100644
--- a/aleksis/apps/paweljong/urls.py
+++ b/aleksis/apps/paweljong/urls.py
@@ -50,8 +50,16 @@ urlpatterns = [
),
path("misc/set_email_needed/<slug:slug>", views.set_email_needed, name="set_email_needed"),
path("misc/set_email_needed/", views.set_email_needed, name="set_email_needed_no_slug"),
- path("account/register/start", views.AccountRegisterStart.as_view(), name="register_account_start"),
- path("account/register", views.AccountRegisterWizardView.as_view(account_forms, condition_dict=account_conditions), name="register_account"),
+ path(
+ "account/register/start",
+ views.AccountRegisterStart.as_view(),
+ name="register_account_start",
+ ),
+ path(
+ "account/register",
+ views.AccountRegisterWizardView.as_view(account_forms, condition_dict=account_conditions),
+ name="register_account",
+ ),
path("events/feed", views.UpcomingEventsRSSFeed(), name="upcoming_events_rss_feed"),
path("events/create", views.CreateEventView.as_view(), name="create_event"),
path("events/manage", views.manage_events, name="manage_events"),
diff --git a/aleksis/apps/paweljong/views.py b/aleksis/apps/paweljong/views.py
index 211c038..972e2ca 100644
--- a/aleksis/apps/paweljong/views.py
+++ b/aleksis/apps/paweljong/views.py
@@ -276,6 +276,7 @@ def set_email_needed(request, slug: Optional[str] = None):
def is_email_needed(wizard):
return wizard.request.session.pop("email_needed", None)
+
TEMPLATES = {
"email": "paweljong/event/register_wizard.html",
"register": "paweljong/event/register_wizard.html",
@@ -286,6 +287,7 @@ TEMPLATES = {
"consent": "paweljong/event/register_wizard_consent.html",
}
+
class AccountRegisterWizardView(SessionWizardView):
template_name = "paweljong/account_wizard.html"
file_storage = settings.DEFAULT_FILE_STORAGE
@@ -357,7 +359,6 @@ class AccountRegisterWizardView(SessionWizardView):
"last_name": cleaned_data_register["last_name"],
"date_of_birth": cleaned_data_register["date_of_birth"],
},
-
)
return redirect("index")
@@ -764,6 +765,7 @@ class UpcomingEventsRSSFeed(Feed):
def item_description(self, item):
return item.description
+
class AccountRegisterStart(TemplateView):
template_name = "paweljong/register_start.html"
--
GitLab