Fix wtfforms setting fields to empty string instead of None

diff --git a/app/views/packages/packages.py b/app/views/packages/packages.py
index 1a9b106c8f71dec94308ab91365c5526b450d056..38aacbebac6da51dacd80b71b004fa90fc5b6f6a 100644 (file)
--- a/app/views/packages/packages.py
+++ b/app/views/packages/packages.py
@@ -180,9 +180,9 @@ class PackageForm(FlaskForm):
        tags          = QuerySelectMultipleField('Tags', query_factory=lambda: Tag.query.order_by(db.asc(Tag.name)), get_pk=lambda a: a.id, get_label=lambda a: a.title)
        harddep_str   = StringField("Hard Dependencies", [Optional()])
        softdep_str   = StringField("Soft Dependencies", [Optional()])
-       repo          = StringField("VCS Repository URL", [Optional(), URL()])
-       website       = StringField("Website URL", [Optional(), URL()])
-       issueTracker  = StringField("Issue Tracker URL", [Optional(), URL()])
+       repo          = StringField("VCS Repository URL", [Optional(), URL()], filters = [lambda x: x or None])
+       website       = StringField("Website URL", [Optional(), URL()], filters = [lambda x: x or None])
+       issueTracker  = StringField("Issue Tracker URL", [Optional(), URL()], filters = [lambda x: x or None])
        forums        = IntegerField("Forum Topic ID", [Optional(), NumberRange(0,999999)])
        submit        = SubmitField("Save")
 

diff --git a/app/views/packages/releases.py b/app/views/packages/releases.py
index 21996753617dd2efda3e81d4ee4cfa8927bf309a..f459ee65d23175cf3eec0975914bb6d0238b1c09 100644 (file)
--- a/app/views/packages/releases.py
+++ b/app/views/packages/releases.py
@@ -54,7 +54,7 @@ class CreatePackageReleaseForm(FlaskForm):
 class EditPackageReleaseForm(FlaskForm):
        title    = StringField("Title", [InputRequired(), Length(1, 30)])
        url      = StringField("URL", [URL])
-       task_id  = StringField("Task ID")
+       task_id  = StringField("Task ID", filters = [lambda x: x or None])
        approved = BooleanField("Is Approved")
        min_rel  = QuerySelectField("Minimum Minetest Version", [InputRequired()],
                        query_factory=lambda: get_mt_releases(False), get_pk=lambda a: a.id, get_label=lambda a: a.name)

diff --git a/app/views/users/users.py b/app/views/users/users.py
index a31b1e0192ca9691729751288c85b26908ba95c3..1a81c7de71241c1016c0886de3406874d2a9bb00 100644 (file)
--- a/app/views/users/users.py
+++ b/app/views/users/users.py
@@ -31,9 +31,9 @@ from app.tasks.phpbbparser import getProfile
 # Define the User profile form
 class UserProfileForm(FlaskForm):
        display_name = StringField("Display name", [Optional(), Length(2, 20)])
-       email = StringField("Email", [Optional(), Email()])
-       website_url = StringField("Website URL", [Optional(), URL()])
-       donate_url = StringField("Donation URL", [Optional(), URL()])
+       email = StringField("Email", [Optional(), Email()], filters = [lambda x: x or None])
+       website_url = StringField("Website URL", [Optional(), URL()], filters = [lambda x: x or None])
+       donate_url = StringField("Donation URL", [Optional(), URL()], filters = [lambda x: x or None])
        rank = SelectField("Rank", [Optional()], choices=UserRank.choices(), coerce=UserRank.coerce, default=UserRank.NEW_MEMBER)
        submit = SubmitField("Save")