scottk/Mailu-OIDC
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu-OIDC.git synced 2025-11-01 18:47:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify again the logic

Browse Source 
(cherry picked from commit f003c0e712)
This commit is contained in:
Florent Daigniere
2024-07-29 20:33:32 +02:00
committed by Mergify
parent 745d26acf5
commit 6173f5e434
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,14 +92,12 @@ def user_settings(user_email):
user = models.User.query.get(user_email_or_current) or flask.abort(404) user = models.User.query.get(user_email_or_current) or flask.abort(404)
form = forms.UserSettingsForm(obj=user) form = forms.UserSettingsForm(obj=user)
utils.formatCSVField(form.forward_destination) utils.formatCSVField(form.forward_destination)
form.forward_enabled.data = bool(flask.request.form.get('forward_enabled', False))
if form.validate_on_submit(): if form.validate_on_submit():
user.forward_enabled = bool(flask.request.form.get('forward_enabled', False))
if form.forward_enabled 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') flask.flash('Destination email address is missing', 'error')
return flask.redirect( return flask.redirect(
flask.url_for('.user_settings', user=user.email)) flask.url_for('.user_settings', user_email=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.forward_destination.data = form.forward_destination.data.replace(" ","").split(",")
form.populate_obj(user) form.populate_obj(user)
models.db.session.commit() models.db.session.commit()
@@ -109,8 +107,9 @@ def user_settings(user_email):
return flask.redirect( return flask.redirect(
flask.url_for('.user_list', domain_name=user.domain.name)) flask.url_for('.user_list', domain_name=user.domain.name))
elif form.is_submitted() and not form.validate(): elif form.is_submitted() and not form.validate():
flask.flash('Error validating the form', 'error')
return flask.redirect( return flask.redirect(
flask.url_for('.user_settings', user=user.email)) flask.url_for('.user_settings', user_email=user_email))
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): def _process_password_change(form, user_email):

1
core/admin/mailu/utils.py
View File

@@ -532,6 +532,7 @@ def isBadOrPwned(form):
def formatCSVField(field): def formatCSVField(field):
if not field.data: if not field.data:
field.data = ''
return return
if isinstance(field.data,str): if isinstance(field.data,str):
data = field.data.replace(" ","").split(",") data = field.data.replace(" ","").split(",")