scottk/Mailu
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu.git synced 2025-12-16 21:07:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues with forward_destination in api and user form

Browse Source 
* form
  * Fixed: Internal error occurred if an empty forward_destination was entered and forward_enabled was false
  * Fixed: form did not check if forward_destination is empty.
  * Fixed: form marked forward_destination field as read-only upon reloading form upon validation error
* api - create user and update/patch user
  * Create/Patch user did not check if forward_destination email address is valid
  * Create/Patch user did not check if forward_destination is present and forward_enabled is true
This commit is contained in:
Dimitri Huisman
2024-03-23 14:14:43 +00:00
parent acb878a43f
commit 9e468100a0
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/admin/mailu/ui/views/users.py
View File

@@ -93,7 +93,12 @@ def user_settings(user_email):
form = forms.UserSettingsForm(obj=user)
utils.formatCSVField(form.forward_destination)
if form.validate_on_submit():
form.forward_destination.data = form.forward_destination.data.replace(" ","").split(",")
if form.forward_enabled.data 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(",")
form.populate_obj(user)
models.db.session.commit()
form.forward_destination.data = ", ".join(form.forward_destination.data)
@@ -101,6 +106,9 @@ def user_settings(user_email):
if 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.render_template('user/settings.html', form=form, user=user)
def _process_password_change(form, user_email):