Move filters and default to the AppInfoForm intead of parent form

This commit is contained in:
leigh-mil 2019-03-12 10:07:17 -04:00
parent 1b642e22f6
commit 21a0168d7e

View File

@ -31,13 +31,9 @@ class AppInfoWithExistingPortfolioForm(BaseForm):
scope = TextAreaField( scope = TextAreaField(
translate("forms.task_order.scope_label"), translate("forms.task_order.scope_label"),
description=translate("forms.task_order.scope_description"), description=translate("forms.task_order.scope_description"),
filters=[lambda x: x or None],
) )
defense_component = SelectField( defense_component = SelectField(
translate("forms.task_order.defense_component_label"), translate("forms.task_order.defense_component_label"), choices=SERVICE_BRANCHES
choices=SERVICE_BRANCHES,
default="",
filters=[lambda x: x or None],
) )
app_migration = RadioField( app_migration = RadioField(
translate("forms.task_order.app_migration.label"), translate("forms.task_order.app_migration.label"),
@ -94,6 +90,7 @@ class AppInfoForm(AppInfoWithExistingPortfolioForm):
portfolio_name = StringField( portfolio_name = StringField(
translate("forms.task_order.portfolio_name_label"), translate("forms.task_order.portfolio_name_label"),
description=translate("forms.task_order.portfolio_name_description"), description=translate("forms.task_order.portfolio_name_description"),
filters=[lambda x: x or None],
validators=[ validators=[
Required(), Required(),
Length( Length(
@ -104,7 +101,10 @@ class AppInfoForm(AppInfoWithExistingPortfolioForm):
], ],
) )
defense_component = SelectField( defense_component = SelectField(
translate("forms.task_order.defense_component_label"), choices=SERVICE_BRANCHES translate("forms.task_order.defense_component_label"),
choices=SERVICE_BRANCHES,
default="",
filters=[lambda x: x or None],
) )