From a26ec27290be50d896118676760fd933a1f05dc9 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Fri, 25 Jan 2019 15:08:41 +0100 Subject: [PATCH] Fix password validator for creating fetched accounts (cherry picked from commit 34b31727c4ae230cf3dffa65c779046e0e129bff) # Conflicts: # CHANGELOG.md # core/admin/mailu/ui/views/fetches.py --- CHANGELOG.md | 5 +++++ core/admin/mailu/ui/views/fetches.py | 3 +++ 2 files changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d69ea664..b1e35f73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -563,9 +563,14 @@ deprecated before 1.8.0, you can switch to an external database server by then. - Enhancement: Make Unbound drop privileges after binding to port - Enhancement: Stop using static assets, but build them using Webpack - Enhancement: Create an Authentication Token with IPv6 address restriction ([#829](https://github.com/Mailu/Mailu/issues/829)) +<<<<<<< HEAD - Enhancement: Automatically create admin user on container startup if given appropriate environment variables - Enhancement: Missing wildcard option in alias flask command ([#869](https://github.com/Mailu/Mailu/issues/869)) +======= +- Bug: Fix creating new fetched accounts +- +>>>>>>> 34b31727 (Fix password validator for creating fetched accounts) v1.6.0 - 2019-01-18 ------------------- diff --git a/core/admin/mailu/ui/views/fetches.py b/core/admin/mailu/ui/views/fetches.py index 3c4d629d..f9daca0e 100644 --- a/core/admin/mailu/ui/views/fetches.py +++ b/core/admin/mailu/ui/views/fetches.py @@ -28,7 +28,10 @@ def fetch_create(user_email): user = models.User.query.get(user_email) or flask.abort(404) form = forms.FetchForm() form.password.validators = [wtforms.validators.DataRequired()] +<<<<<<< HEAD utils.formatCSVField(form.folders) +======= +>>>>>>> 34b31727 (Fix password validator for creating fetched accounts) if form.validate_on_submit(): fetch = models.Fetch(user=user) form.populate_obj(fetch)