From 9120f731fc610407a11fb72020b21c7046924efa Mon Sep 17 00:00:00 2001 From: Florent Daigniere Date: Sun, 28 Jul 2024 22:54:55 +0200 Subject: [PATCH] Fix email forwarding when set from the UI --- core/admin/mailu/ui/views/users.py | 16 +++++++++------- towncrier/newsfragments/3349.bugfix | 1 + 2 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 towncrier/newsfragments/3349.bugfix diff --git a/core/admin/mailu/ui/views/users.py b/core/admin/mailu/ui/views/users.py index d3816c4a..df0a716d 100644 --- a/core/admin/mailu/ui/views/users.py +++ b/core/admin/mailu/ui/views/users.py @@ -92,13 +92,15 @@ def user_settings(user_email): user = models.User.query.get(user_email_or_current) or flask.abort(404) form = forms.UserSettingsForm(obj=user) utils.formatCSVField(form.forward_destination) + form.forward_enabled.data = bool(flask.request.form.get('forward_enabled', False)) if form.validate_on_submit(): - if form.forward_enabled.data and (form.forward_destination.data in ['', None] or type(form.forward_destination.data) is list): + if form.forward_enabled and (form.forward_destination.data in ['', None] or type(form.forward_destination.data) is list): flask.flash('Destination email address is missing', 'error') - user.forward_enabled = True - return flask.render_template('user/settings.html', form=form, user=user) - if form.forward_enabled.data: - form.forward_destination.data = form.forward_destination.data.replace(" ","").split(",") + return flask.redirect( + flask.url_for('.user_settings', user=user.email)) + if not user.forward_enabled and not flask.request.form.get('forward_destination', None): + form.forward_destination.data = "" + form.forward_destination.data = form.forward_destination.data.replace(" ","").split(",") form.populate_obj(user) models.db.session.commit() form.forward_destination.data = ", ".join(form.forward_destination.data) @@ -107,8 +109,8 @@ def user_settings(user_email): return flask.redirect( flask.url_for('.user_list', domain_name=user.domain.name)) elif form.is_submitted() and not form.validate(): - user.forward_enabled = form.forward_enabled.data - return flask.render_template('user/settings.html', form=form, user=user) + return flask.redirect( + flask.url_for('.user_settings', user=user.email)) return flask.render_template('user/settings.html', form=form, user=user) def _process_password_change(form, user_email): diff --git a/towncrier/newsfragments/3349.bugfix b/towncrier/newsfragments/3349.bugfix new file mode 100644 index 00000000..b1dd1e0a --- /dev/null +++ b/towncrier/newsfragments/3349.bugfix @@ -0,0 +1 @@ +Fix email-forwarding when set from the web interface