From 98dbc2f2903887017ef55ce571bc5859918678b3 Mon Sep 17 00:00:00 2001
From: Lukas Juhrich <lukas.juhrich@agdsn.de>
Date: Fri, 15 Mar 2024 15:07:23 +0100
Subject: [PATCH 01/10] add wtforms_widgets submodule

---
 .gitmodules                         | 4 ++++
 build/requirements/requirements.txt | 1 +
 wtforms_widgets                     | 1 +
 3 files changed, 6 insertions(+)
 create mode 100644 .gitmodules
 create mode 160000 wtforms_widgets

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..18b16248
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "wtforms_widgets"]
+	path = wtforms_widgets
+	url = https://github.com/agdsn/wtforms-widgets.git
+	branch = pycroft
diff --git a/build/requirements/requirements.txt b/build/requirements/requirements.txt
index 43d52113..5c45f0d7 100644
--- a/build/requirements/requirements.txt
+++ b/build/requirements/requirements.txt
@@ -24,3 +24,4 @@ recurring_ical_events~=1.0.2b0
 cachetools~=5.2.0
 python-dotenv~=0.21.0
 pydantic~=2.4.2
+-e wtforms_widgets
diff --git a/wtforms_widgets b/wtforms_widgets
new file mode 160000
index 00000000..bb423ae6
--- /dev/null
+++ b/wtforms_widgets
@@ -0,0 +1 @@
+Subproject commit bb423ae68b5339c069c4fe615a961f947eccb917

From cbefa8500ee2b232e7f16d2f1a99de0c14805730 Mon Sep 17 00:00:00 2001
From: Lukas Juhrich <lukas.juhrich@agdsn.de>
Date: Fri, 15 Mar 2024 16:30:56 +0100
Subject: [PATCH 02/10] Fix (but also break) layout

The implicit assumption in wtforms_widgets is to leave a 4fr (of 12fr) gap to the right
of the form. That needs to be fixed.
---
 sipa/initialization.py           |  2 +-
 sipa/templates/login.html        |  8 ++++++--
 sipa/templates/macros/forms.html | 29 +++++++----------------------
 3 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/sipa/initialization.py b/sipa/initialization.py
index 8d76de74..fc28b670 100644
--- a/sipa/initialization.py
+++ b/sipa/initialization.py
@@ -82,7 +82,7 @@ def init_app(app, **kwargs):
 
     logger.debug('Registering Jinja globals')
     form_label_width = 4
-    form_input_width = 8
+    form_input_width = 4
     app.jinja_env.globals.update(
         current_user=current_user,
         cf_pages=cf_pages,
diff --git a/sipa/templates/login.html b/sipa/templates/login.html
index 6df90102..75202c76 100644
--- a/sipa/templates/login.html
+++ b/sipa/templates/login.html
@@ -5,8 +5,12 @@
 {% block content %}
 {% include "heading.html" %}
 {% call forms.render(form=form, form_id="loginform", cancel_to=url_for('.index')) %}
-    <div class="{{ form_input_offset_class }} {{ form_input_width_class }} alert alert-info login_form">
-        <a href="{{ url_for('generic.request_password_reset') }}">{{ _("Passwort vergessen?") }}</a>
+    <div class="row">
+        <div class="{{ form_input_offset_class }} {{ form_input_width_class }}">
+            <div class="alert alert-info login_form">
+                <a href="{{ url_for('generic.request_password_reset') }}">{{ _("Passwort vergessen?") }}</a>
+            </div>
+        </div>
     </div>
 {% endcall %}
 {% endblock %}
diff --git a/sipa/templates/macros/forms.html b/sipa/templates/macros/forms.html
index c72a4b28..6038cea3 100644
--- a/sipa/templates/macros/forms.html
+++ b/sipa/templates/macros/forms.html
@@ -4,33 +4,18 @@
 {%- endmacro %}
 
 {% macro render(form, form_id='form', reset_button=False, cancel_to=None, submit_text=_("Abschicken"), cancel_text=_("Abbrechen"), extra_btn=None, links=None) -%}
-    <div id="{{ form_id }}" class="container col-sm-10">
+    <div id="{{ form_id }}" class="container col-sm-12">
         <form action="" method="post" class="form form-horizontal">
             {{ form.csrf_token }}
             {% for field in form -%}{% if field and field.id != 'csrf_token' %}
                 {% if loop.index0 == 0 %}{% set focus = true %}{% endif %}
-                <div class="row mb-3 {% if field.errors %}has-error{% endif %}">
-                    {% if field.type == "BooleanField" %}
-                        <div class="{{ form_input_offset_class }} {{ form_input_width_class }}">
-                            {% set label=field.label(class_="form-check-label") %}
-                            <div class="form-check">
-                                <!-- `for="{field.id}"` included in `form.label()` rendering -->
-                                <!--suppress HtmlFormInputWithoutLabel -->
-                                <input id="{{ field.name }}" type="checkbox" class="form-check-input" name="{{ field.name }}"
-                                    {{ 'checked' if field.data | default(field.default) }}>
-                                {% if links %}{{ label | render_links(links) | safe }}
-                                {% else %}{{ label }}{% endif %}
-                            </div>
-                        </div>
-                    {% elif field.type != "HiddenField" %}
-                        <div class="{{ form_label_width_class }} col-form-label">
-                            {{ field.label() }}
-                        </div>
-                        <div class="{{ form_input_width_class }}">
-                            {{ render_field(field, focus=focus) }}
-                        </div>
-                    {% endif %}
+                {% if field.flags.hidden %}
+                {{ field() }}
+                {% else %}
+                <div class="mb-3">
+                {{ field(render_mode="horizontal", autofocus=focus) }}
                 </div>
+                {% endif %}
             {% endif %}{%- endfor %}
 
             {# Here can things like notes or alerts be placed #}

From 7e3f658ca313e94211e88ef6f5dd88ed20687f34 Mon Sep 17 00:00:00 2001
From: Lukas Juhrich <lukas.juhrich@agdsn.de>
Date: Fri, 15 Mar 2024 16:33:10 +0100
Subject: [PATCH 03/10] Fix link rendering by using lazy post-processing

I don't think we should do this in the template.
---
 sipa/blueprints/register.py       | 10 ++--
 sipa/forms.py                     | 90 +++++++++++++++++++++----------
 sipa/initialization.py            |  2 -
 sipa/templates/macros/forms.html  |  2 +-
 sipa/templates/register/data.html |  2 +-
 5 files changed, 67 insertions(+), 39 deletions(-)

diff --git a/sipa/blueprints/register.py b/sipa/blueprints/register.py
index 6ec6d340..9f46dc82 100644
--- a/sipa/blueprints/register.py
+++ b/sipa/blueprints/register.py
@@ -249,13 +249,9 @@ def data(reg_state: RegisterState):
                       "Dadurch kann dein Antrag nicht automatisch bearbeitet werden. "
                       "Eine manuelle Bearbeitung kann mehrere Tage dauern."), 'warning')
 
-    return render_template('register/data.html', title=gettext('Konto erstellen'), form=form,
-                           links={
-                               'constitution': '../pages/legal/agdsn_constitution',
-                               'fee_regulation': '../pages/legal/membership_fee_regulations',
-                               'network_constitution': '../pages/legal/network_constitution',
-                               'privacy_policy': '../pages/legal/agdsn_dataprotection',
-                           })
+    return render_template(
+        "register/data.html", title=gettext("Konto erstellen"), form=form
+    )
 
 
 @bp_register.route("/finish")
diff --git a/sipa/forms.py b/sipa/forms.py
index fb775dc5..12bdc0be 100644
--- a/sipa/forms.py
+++ b/sipa/forms.py
@@ -1,13 +1,16 @@
 import re
+import typing as t
 from datetime import date
+from dataclasses import dataclass
+from functools import partial
 from operator import itemgetter
 
 from flask_babel import gettext, lazy_gettext
 from flask import flash
 from flask_login import current_user
-from flask_wtf import FlaskForm
+from wtforms_widgets.base_form import BaseForm as FlaskForm
 from werkzeug.local import LocalProxy
-from wtforms import (
+from wtforms_widgets.fields.core import (
     BooleanField,
     HiddenField,
     PasswordField,
@@ -40,6 +43,38 @@ def __init__(self, message=None):
         super().__init__(mac_regex, message=message)
 
 
+_LINK_PLACEHOLDER = re.compile(r"\[(?P<text>[^\]]+)\]\((?P<link>[^)]+)\)")
+
+
+def render_links(raw: str, links: dict):
+    """
+    Replace link placeholders in label of BooleanFields.
+
+    :param raw: Text that contains the link placeholders.
+    :param links: Link placeholder to url mapping.
+    """
+
+    def render_link(match: re.Match) -> str:
+        link = match.group("link")
+        if link in links:
+            return f'<a target="_blank" href="{links[link]}">{match.group("text")}</a>'
+        else:
+            return match.group(0)
+
+    return _LINK_PLACEHOLDER.sub(render_link, raw)
+
+
+@dataclass
+class LazilyProcessed:
+    message: str
+    process: t.Callable
+
+    def __str__(self):
+        return self.process(self.message.__str__())
+
+    def __html__(self):
+        return self.process(self.message.__html__())
+
 
 class PasswordComplexity:
     character_classes = ((re.compile(r'[a-z]'), lazy_gettext("Kleinbuchstaben (a-z)")),
@@ -545,12 +580,25 @@ class RegisterFinishForm(FlaskForm):
                 "Bitte bestätige, dass deine Angaben korrekt sind."))
         ]
     )
-
+    _render_links = partial(
+        render_links,
+        links={
+            "constitution": "../pages/legal/agdsn_constitution",
+            "fee_regulation": "../pages/legal/finance_constitution",
+            "network_constitution": "../pages/legal/network_constitution",
+            "privacy_policy": "../pages/legal/agdsn_dataprotection",
+        },
+    )
     confirm_legal_2 = BooleanField(
-        label=lazy_gettext("Ich bestätige, dass ich die [Satzung](constitution) und Ordnungen "
-                           "der AG DSN in ihrer jeweils aktuellen Fassung anerkenne, "
-                           "insbesondere die [Netzordnungen](network_constitution) "
-                           "und die [Beitragsordnung](fee_regulation)."),
+        label=LazilyProcessed(
+            lazy_gettext(
+                "Ich bestätige, dass ich die [Satzung](constitution) und Ordnungen "
+                "der AG DSN in ihrer jeweils aktuellen Fassung anerkenne, "
+                "insbesondere die [Netzordnungen](network_constitution) "
+                "und die [Beitragsordnung](fee_regulation)."
+            ),
+            process=_render_links,
+        ),
         validators=[
             DataRequired(lazy_gettext(
                 "Bitte bestätige deine Zustimmung zur Satzung und weiteren Ordnungen."))
@@ -558,8 +606,13 @@ class RegisterFinishForm(FlaskForm):
     )
 
     confirm_legal_3 = BooleanField(
-        label=lazy_gettext("Ich habe die [Datenschutzbestimmungen](privacy_policy) verstanden "
-                           "und stimme diesen zu."),
+        label=LazilyProcessed(
+            lazy_gettext(
+                "Ich habe die [Datenschutzbestimmungen](privacy_policy) verstanden "
+                "und stimme diesen zu."
+            ),
+            process=_render_links,
+        ),
         validators=[
             DataRequired(lazy_gettext(
                 "Bitte bestätige deine Zustimmung zu der Datenschutzbelehrung."))
@@ -576,22 +629,3 @@ def flash_formerrors(form):
         for e in errors:
             flash(e, "error")
 
-
-_LINK_PLACEHOLDER = re.compile(r'\[(?P<text>[^\]]+)\]\((?P<link>[^)]+)\)')
-
-
-def render_links(raw: str, links: dict):
-    """
-    Replace link placeholders in label of BooleanFields.
-
-    :param raw: Text that contains the link placeholders.
-    :param links: Link placeholder to url mapping.
-    """
-    def render_link(match: re.Match) -> str:
-        link = match.group('link')
-        if link in links:
-            return f'<a target="_blank" href="{links[link]}">{match.group("text")}</a>'
-        else:
-            return match.group(0)
-
-    return _LINK_PLACEHOLDER.sub(render_link, raw)
diff --git a/sipa/initialization.py b/sipa/initialization.py
index fc28b670..cfba6bdc 100644
--- a/sipa/initialization.py
+++ b/sipa/initialization.py
@@ -24,7 +24,6 @@
 from sipa.blueprints.usersuite import get_attribute_endpoint
 from sipa.defaults import DEFAULT_CONFIG
 from sipa.flatpages import CategorizedFlatPages
-from sipa.forms import render_links
 from sipa.model import AVAILABLE_DATASOURCES
 from sipa.model.misc import should_display_traffic_data
 from sipa.session import SeparateLocaleCookieSessionInterface
@@ -99,7 +98,6 @@ def init_app(app, **kwargs):
         url_self=url_self,
         now=datetime.now(UTC),
     )
-    app.add_template_filter(render_links)
 
     logger.debug("Jinja globals have been set",
                  extra={'data': {'jinja_globals': app.jinja_env.globals}})
diff --git a/sipa/templates/macros/forms.html b/sipa/templates/macros/forms.html
index 6038cea3..e6879076 100644
--- a/sipa/templates/macros/forms.html
+++ b/sipa/templates/macros/forms.html
@@ -3,7 +3,7 @@
     {{ field(class="form-control", placeholder=description, autofocus=first) }}
 {%- endmacro %}
 
-{% macro render(form, form_id='form', reset_button=False, cancel_to=None, submit_text=_("Abschicken"), cancel_text=_("Abbrechen"), extra_btn=None, links=None) -%}
+{% macro render(form, form_id='form', reset_button=False, cancel_to=None, submit_text=_("Abschicken"), cancel_text=_("Abbrechen"), extra_btn=None) -%}
     <div id="{{ form_id }}" class="container col-sm-12">
         <form action="" method="post" class="form form-horizontal">
             {{ form.csrf_token }}
diff --git a/sipa/templates/register/data.html b/sipa/templates/register/data.html
index f95bfbae..db1fdb5d 100644
--- a/sipa/templates/register/data.html
+++ b/sipa/templates/register/data.html
@@ -3,5 +3,5 @@
 {% block register_content %}
     {{  forms.render_simple(form=form, form_id="register-form",
                             submit_text=_("Kostenpflichtig Mitglied werden (5€/Mo.)"),
-                            cancel_to=url_for('.cancel'), links=links) }}
+                            cancel_to=url_for('.cancel')) }}
 {% endblock %}

From ae5514366d8bd37e031dd860c23835eec5a52589 Mon Sep 17 00:00:00 2001
From: Lukas Juhrich <lukas.juhrich@agdsn.de>
Date: Fri, 15 Mar 2024 16:39:32 +0100
Subject: [PATCH 04/10] Fix form proportions

---
 sipa/initialization.py | 2 +-
 wtforms_widgets        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sipa/initialization.py b/sipa/initialization.py
index cfba6bdc..7ce0c420 100644
--- a/sipa/initialization.py
+++ b/sipa/initialization.py
@@ -81,7 +81,7 @@ def init_app(app, **kwargs):
 
     logger.debug('Registering Jinja globals')
     form_label_width = 4
-    form_input_width = 4
+    form_input_width = 8
     app.jinja_env.globals.update(
         current_user=current_user,
         cf_pages=cf_pages,
diff --git a/wtforms_widgets b/wtforms_widgets
index bb423ae6..4ca77639 160000
--- a/wtforms_widgets
+++ b/wtforms_widgets
@@ -1 +1 @@
-Subproject commit bb423ae68b5339c069c4fe615a961f947eccb917
+Subproject commit 4ca776390bf719990f427484052034d3bda1485b

From 5ee1e23407a4261d5f601639810e9d928614e464 Mon Sep 17 00:00:00 2001
From: Lukas Juhrich <lukas.juhrich@agdsn.de>
Date: Fri, 15 Mar 2024 16:47:26 +0100
Subject: [PATCH 05/10] Remove superfluous error flashes

---
 sipa/blueprints/generic.py       | 19 ++++++--------
 sipa/blueprints/register.py      | 13 +++-------
 sipa/blueprints/usersuite.py     | 43 ++++++++++----------------------
 sipa/forms.py                    | 12 ---------
 sipa/templates/macros/forms.html |  1 +
 5 files changed, 24 insertions(+), 64 deletions(-)

diff --git a/sipa/blueprints/generic.py b/sipa/blueprints/generic.py
index ee52faa2..94843aed 100644
--- a/sipa/blueprints/generic.py
+++ b/sipa/blueprints/generic.py
@@ -18,8 +18,13 @@
 from sqlalchemy.exc import DatabaseError
 
 from sipa.backends.exceptions import BackendError
-from sipa.forms import flash_formerrors, LoginForm, AnonymousContactForm, \
-    OfficialContactForm, PasswordRequestResetForm, PasswordResetForm
+from sipa.forms import (
+    LoginForm,
+    AnonymousContactForm,
+    OfficialContactForm,
+    PasswordRequestResetForm,
+    PasswordResetForm,
+)
 from sipa.mail import send_official_contact_mail, send_contact_mail
 from sipa.backends.extension import backends
 from sipa.model import pycroft
@@ -154,8 +159,6 @@ def login():
                 logger.info('Authentication successful',
                             extra={'tags': {'user': username}})
                 flash(gettext("Anmeldung erfolgreich!"), "success")
-    elif form.is_submitted():
-        flash_formerrors(form)
 
     if current_user.is_authenticated:
         # `url_redirect` would not be bad here because this would allow for URL
@@ -198,8 +201,6 @@ def request_password_reset():
                           "Falls du die Nachricht nicht erhälst, wende dich an den Support."), "success")
 
             return redirect(url_for('.login'))
-    elif form.is_submitted():
-        flash_formerrors(form)
 
     return render_template('generic_form.html', page_title=gettext("Passwort zurücksetzen"),
                            form_args={'form': form, 'cancel_to': url_for('.login')})
@@ -222,8 +223,6 @@ def reset_password(token):
             flash(gettext("Dein Passwort wurde geändert."), "success")
 
             return redirect(url_for('.login'))
-    elif form.is_submitted():
-        flash_formerrors(form)
 
     return render_template('generic_form.html', page_title=gettext("Passwort zurücksetzen"),
                            form_args={'form': form, 'cancel_to': url_for('.login')})
@@ -330,8 +329,6 @@ def contact():
             flash(gettext("Es gab einen Fehler beim Versenden der Nachricht."),
                   'error')
         return redirect(url_for('.index'))
-    elif form.is_submitted():
-        flash_formerrors(form)
 
     return render_template('anonymous_contact.html', form=form)
 
@@ -354,8 +351,6 @@ def contact_official():
             flash(gettext("Es gab einen Fehler beim Versenden der Nachricht."),
                   'error')
         return redirect(url_for('.index'))
-    elif form.is_submitted():
-        flash_formerrors(form)
 
     return render_template(
         'official_contact.html',
diff --git a/sipa/blueprints/register.py b/sipa/blueprints/register.py
index 9f46dc82..c58bb550 100644
--- a/sipa/blueprints/register.py
+++ b/sipa/blueprints/register.py
@@ -13,7 +13,7 @@
 from werkzeug.local import LocalProxy
 
 from sipa.backends.extension import backends, _dorm_summary
-from sipa.forms import flash_formerrors, RegisterIdentifyForm, RegisterRoomForm, RegisterFinishForm
+from sipa.forms import RegisterIdentifyForm, RegisterRoomForm, RegisterFinishForm
 from sipa.model.pycroft.api import PycroftApi, PycroftApiError
 from sipa.model.pycroft.exc import PycroftBackendError
 from sipa.utils import parse_date
@@ -167,9 +167,6 @@ def identify(reg_state: RegisterState):
         except PycroftBackendError as e:
             handle_backend_error(e)
 
-    elif form.is_submitted():
-        flash_formerrors(form)
-
     return render_template('register/identify.html', title=gettext('Identifizierung'), form=form,
                            skip_verification=suggest_skip)
 
@@ -181,9 +178,7 @@ def room(reg_state: RegisterState):
     if form.validate_on_submit():
         reg_state.room_confirmed = 'wrong_room' not in request.form
         return goto_step('data')
-    elif form.is_submitted():
-        flash_formerrors(form)
-    else:
+    elif not form.is_submitted():
         form.building.data = reg_state.building
         form.room.data = reg_state.room
         form.move_in_date.data = reg_state.move_in_date
@@ -236,9 +231,7 @@ def data(reg_state: RegisterState):
         except PycroftBackendError as e:
             handle_backend_error(e)
 
-    elif form.is_submitted():
-        flash_formerrors(form)
-    else:
+    elif not form.is_submitted():
         form.member_begin_date.data = max(reg_state.move_in_date, date.today()) \
             if reg_state.move_in_date is not None else date.today()
 
diff --git a/sipa/blueprints/usersuite.py b/sipa/blueprints/usersuite.py
index be6a58e5..bf6ec055 100644
--- a/sipa/blueprints/usersuite.py
+++ b/sipa/blueprints/usersuite.py
@@ -22,10 +22,18 @@
 from flask_wtf import FlaskForm
 from markupsafe import Markup
 
-from sipa.forms import ContactForm, ChangeMACForm, ChangeMailForm, \
-    ChangePasswordForm, flash_formerrors, HostingForm, \
-    PaymentForm, ActivateNetworkAccessForm, TerminateMembershipForm, \
-    TerminateMembershipConfirmForm, ContinueMembershipForm
+from sipa.forms import (
+    ContactForm,
+    ChangeMACForm,
+    ChangeMailForm,
+    ChangePasswordForm,
+    HostingForm,
+    PaymentForm,
+    ActivateNetworkAccessForm,
+    TerminateMembershipForm,
+    TerminateMembershipConfirmForm,
+    ContinueMembershipForm,
+)
 from sipa.mail import send_usersuite_contact_mail
 from sipa.model.fancy_property import ActiveProperty
 from sipa.utils import password_changeable, subscribe_to_status_page
@@ -109,7 +117,6 @@ def index():
         months = payment_form.months.data
     else:
         months = payment_form.months.default
-        flash_formerrors(payment_form)
 
     datasource = current_user.datasource
     context = dict(rows=rows,
@@ -168,8 +175,6 @@ def contact():
                           .format(current_user.datasource.support_mail),
                   'error')
         return redirect(url_for('.index'))
-    elif form.is_submitted():
-        flash_formerrors(form)
 
     form.email.default = current_user.mail.raw_value
 
@@ -276,8 +281,6 @@ def change_password():
         else:
             flash(gettext("Passwort wurde geändert"), "success")
             return redirect(url_for('.index'))
-    elif form.is_submitted():
-        flash_formerrors(form)
 
     return render_template("generic_form.html", page_title=gettext("Passwort ändern"),
                            form_args={'form': form, 'reset_button': True, 'cancel_to': url_for('.index')})
@@ -309,9 +312,7 @@ def change_mail():
         else:
             flash(gettext("E-Mail-Adresse wurde geändert"), "success")
             return redirect(url_for('.index'))
-    elif form.is_submitted():
-        flash_formerrors(form)
-    else:
+    elif not form.is_submitted():
         form.email.data = current_user.mail.raw_value
         form.forwarded.data = current_user.mail_forwarded.raw_value
 
@@ -338,8 +339,6 @@ def resend_confirm_mail():
             flash(gettext('Versenden der Bestätigungs-E-Mail ist fehlgeschlagen!'), 'error')
 
         return redirect(url_for('.index'))
-    elif form.is_submitted():
-        flash_formerrors(form)
 
     form_args = {
         'form': form,
@@ -384,9 +383,6 @@ def change_mac():
 
             return redirect(url_for('.index'))
 
-    elif form.is_submitted():
-        flash_formerrors(form)
-
     form.mac.default = current_user.mac.value
 
     return render_template('usersuite/change_mac.html',
@@ -428,9 +424,6 @@ def activate_network_access():
 
             return redirect(url_for('.index'))
 
-    elif form.is_submitted():
-        flash_formerrors(form)
-
     return render_template('generic_form.html', page_title=gettext("Netzwerkanschluss aktivieren"),
                            form_args={'form': form, 'cancel_to': url_for('.index')})
 
@@ -457,8 +450,6 @@ def hosting(action=None):
             flash(gettext("Deine Datenbank wurde erstellt."), 'success')
         else:
             current_user.userdb.change_password(form.password.data)
-    elif form.is_submitted():
-        flash_formerrors(form)
 
     try:
         user_has_db = current_user.userdb.has_db
@@ -495,8 +486,6 @@ def terminate_membership():
 
         return redirect(url_for('.terminate_membership_confirm',
                                 end_date=end_date))
-    elif form.is_submitted():
-        flash_formerrors(form)
 
     form_args = {
         'form': form,
@@ -553,8 +542,6 @@ def terminate_membership_confirm():
             flash(gettext("Deine Mitgliedschaft wird zum angegebenen Datum beendet."), 'success')
 
         return redirect(url_for('.index'))
-    elif form.is_submitted():
-        flash_formerrors(form)
 
     form_args = {
         'form': form,
@@ -595,8 +582,6 @@ def continue_membership():
             flash(gettext("Deine Mitgliedschaft wird fortgesetzt."), 'success')
 
         return redirect(url_for('.index'))
-    elif form.is_submitted():
-        flash_formerrors(form)
 
     form_args = {
         'form': form,
@@ -631,8 +616,6 @@ def reset_wifi_password():
             flash(Markup("{}:<pre>{}</pre>".format(gettext("Es wurde ein neues WLAN Passwort generiert"), new_password)), 'success')
 
         return redirect(url_for('.index'))
-    elif form.is_submitted():
-        flash_formerrors(form)
 
     form_args = {
         'form': form,
diff --git a/sipa/forms.py b/sipa/forms.py
index 12bdc0be..0ebc2cd7 100644
--- a/sipa/forms.py
+++ b/sipa/forms.py
@@ -6,7 +6,6 @@
 from operator import itemgetter
 
 from flask_babel import gettext, lazy_gettext
-from flask import flash
 from flask_login import current_user
 from wtforms_widgets.base_form import BaseForm as FlaskForm
 from werkzeug.local import LocalProxy
@@ -618,14 +617,3 @@ class RegisterFinishForm(FlaskForm):
                 "Bitte bestätige deine Zustimmung zu der Datenschutzbelehrung."))
         ]
     )
-
-
-def flash_formerrors(form):
-    """If a form is submitted but could not be validated, the routing passes
-    the form and this method returns all form errors (form.errors)
-    as flash messages.
-    """
-    for _field, errors in list(form.errors.items()):
-        for e in errors:
-            flash(e, "error")
-
diff --git a/sipa/templates/macros/forms.html b/sipa/templates/macros/forms.html
index e6879076..72817388 100644
--- a/sipa/templates/macros/forms.html
+++ b/sipa/templates/macros/forms.html
@@ -19,6 +19,7 @@
             {% endif %}{%- endfor %}
 
             {# Here can things like notes or alerts be placed #}
+            {# TODO print all nonspecific errors (not belonging to a specific field) at some good location #}
             {{ caller() }}
 
             <div class="form-group">

From f014cfc31df5c814e07923d52cac261884af1f65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gregor=20D=C3=BCster?= <git@gdstr.eu>
Date: Fri, 22 Mar 2024 11:24:23 +0100
Subject: [PATCH 06/10] Fix link to fee regulations in registration

---
 sipa/forms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sipa/forms.py b/sipa/forms.py
index 0ebc2cd7..d615f084 100644
--- a/sipa/forms.py
+++ b/sipa/forms.py
@@ -583,7 +583,7 @@ class RegisterFinishForm(FlaskForm):
         render_links,
         links={
             "constitution": "../pages/legal/agdsn_constitution",
-            "fee_regulation": "../pages/legal/finance_constitution",
+            "fee_regulation": "../pages/legal/membership_fee_regulations",
             "network_constitution": "../pages/legal/network_constitution",
             "privacy_policy": "../pages/legal/agdsn_dataprotection",
         },

From bc57718b58fcaa3edfd1e769c8583e17224d5e0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gregor=20D=C3=BCster?= <git@gdstr.eu>
Date: Mon, 15 Apr 2024 16:42:02 +0200
Subject: [PATCH 07/10] Add submodule to docker build

---
 build/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/Dockerfile b/build/Dockerfile
index c9987f3e..b4a8cf9e 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -23,6 +23,7 @@ RUN apt-get update && apt-get install -y --force-yes --no-install-recommends \
 WORKDIR /opt/sipa
 
 COPY --chown=sipa:sipa ./build /opt/sipa/build/
+COPY --chown=sipa:sipa ./wtforms_widgets /opt/sipa/wtforms_widgets
 ARG additional_requirements
 RUN ./build/install_requirements.py $additional_requirements
 

From 53e15a061b24100adcdea049165e77e3ae57b2b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gregor=20D=C3=BCster?= <git@gdstr.eu>
Date: Mon, 15 Apr 2024 18:07:02 +0200
Subject: [PATCH 08/10] Test for form errors instead of error flash

---
 tests/blueprints/test_bp_generic.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/tests/blueprints/test_bp_generic.py b/tests/blueprints/test_bp_generic.py
index 7416a8a1..8b64c37a 100644
--- a/tests/blueprints/test_bp_generic.py
+++ b/tests/blueprints/test_bp_generic.py
@@ -72,19 +72,21 @@ def test_get(self, client: TestClient, endpoint, template):
             client.assert_ok(endpoint)
 
     def test_post_flashes(self, client: TestClient, endpoint, template):
-        with client.renders_template(template), client.capture_flashes() as flashed:
+        with client.renders_template(template) as recorded:
             client.assert_ok(endpoint, method="POST")
-        assert flashed
-        assert all(m.category == "error" for m in flashed)
+
+        [(_, template_args)] = recorded
+        assert template_args["form"].errors
 
     def test_invalid_data_flashes(
         self, client: TestClient, endpoint, template, invalid_data
     ):
-        with client.renders_template(template), client.flashes_message(
-            ".*", category="error"
-        ):
+        with client.renders_template(template) as recorded:
             client.assert_ok(endpoint, data=invalid_data, method="POST")
 
+        [(_, template_args)] = recorded
+        assert template_args["form"].errors
+
     @pytest.fixture()
     def silence_logs(self):
         logging.disable()

From 484af83b896a2f5a58466a1536c8aed32db320c3 Mon Sep 17 00:00:00 2001
From: Lukas Juhrich <lukas.juhrich@agdsn.de>
Date: Tue, 17 Sep 2024 13:55:31 +0200
Subject: [PATCH 09/10] Fix form rendering of payment details form

---
 sipa/templates/usersuite/_payment_details.html | 10 ++++------
 wtforms_widgets                                |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/sipa/templates/usersuite/_payment_details.html b/sipa/templates/usersuite/_payment_details.html
index ddb54373..766a6836 100644
--- a/sipa/templates/usersuite/_payment_details.html
+++ b/sipa/templates/usersuite/_payment_details.html
@@ -2,14 +2,12 @@ <h2 id="payment-details">{{ _("Zahlungsdetails") }}</h2>
 <form action="#payment-details" method="post" class="form-inline"
       aria-label="{{ _("Monate der Beitragszahlung angeben") }}">
     {{ payment_form.csrf_token }}
-    {{ _("Beitrag für") }}
     <div class="input-group">
-        {{ payment_form.months(class_="form-control", size="2", **{'aria-label': _("Monate")}) }}
-        <span class="input-group-btn">
-            <button type="submit" class="btn btn-secondary">{{ _("Aktualisieren") }}</button>
-        </span>
+        <div class="input-group-text">{{ _("Beitrag für") }}</div>
+        {{ payment_form.months(render_mode="inline") }}
+        <div class="input-group-text">{{ _("Monat(e) zahlen.") }}</div>
+        <button type="submit" class="btn btn-secondary">{{ _("Aktualisieren") }}</button>
     </div>
-    {{ _("Monat(e) zahlen.") }}
 </form>
 <br>
 <div class="card">
diff --git a/wtforms_widgets b/wtforms_widgets
index 4ca77639..4e0e9d7d 160000
--- a/wtforms_widgets
+++ b/wtforms_widgets
@@ -1 +1 @@
-Subproject commit 4ca776390bf719990f427484052034d3bda1485b
+Subproject commit 4e0e9d7da8b90bb14d334d50f8bc8a390f22b5d8

From 4efc10a1cb638e92ee62c46f94d67fa363eada06 Mon Sep 17 00:00:00 2001
From: Lukas Juhrich <lukas.juhrich@agdsn.de>
Date: Tue, 17 Sep 2024 13:58:06 +0200
Subject: [PATCH 10/10] Use icon instead of `Update` text

---
 sipa/templates/usersuite/_payment_details.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sipa/templates/usersuite/_payment_details.html b/sipa/templates/usersuite/_payment_details.html
index 766a6836..72ea60fa 100644
--- a/sipa/templates/usersuite/_payment_details.html
+++ b/sipa/templates/usersuite/_payment_details.html
@@ -6,7 +6,7 @@ <h2 id="payment-details">{{ _("Zahlungsdetails") }}</h2>
         <div class="input-group-text">{{ _("Beitrag für") }}</div>
         {{ payment_form.months(render_mode="inline") }}
         <div class="input-group-text">{{ _("Monat(e) zahlen.") }}</div>
-        <button type="submit" class="btn btn-secondary">{{ _("Aktualisieren") }}</button>
+        <button type="submit" class="btn btn-secondary"><i class="bi bi-arrow-repeat"></i></button>
     </div>
 </form>
 <br>