From 094550f99c635f92ae797c7a0b5efba36f2d3941 Mon Sep 17 00:00:00 2001 From: George Drummond Date: Fri, 3 May 2019 11:36:00 -0400 Subject: [PATCH] Our invalid forms are blocked via JS now --- atst/forms/application.py | 3 +-- atst/routes/applications/settings.py | 15 +++------------ 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/atst/forms/application.py b/atst/forms/application.py index b82c1b99..4fae3f1c 100644 --- a/atst/forms/application.py +++ b/atst/forms/application.py @@ -1,12 +1,11 @@ from .forms import BaseForm -from wtforms.fields import StringField, TextAreaField, FieldList, HiddenField +from wtforms.fields import StringField, TextAreaField, FieldList from wtforms.validators import Required from atst.forms.validators import ListItemRequired, ListItemsUnique from atst.utils.localization import translate class EditEnvironmentForm(BaseForm): - id = HiddenField() name = StringField( label=translate("forms.environments.name_label"), validators=[Required()] ) diff --git a/atst/routes/applications/settings.py b/atst/routes/applications/settings.py index 8378bcb2..0ca20a27 100644 --- a/atst/routes/applications/settings.py +++ b/atst/routes/applications/settings.py @@ -13,20 +13,13 @@ from atst.models.permissions import Permissions from atst.utils.flash import formatted_flash as flash -def get_environments_obj_for_app(application, form=None): +def get_environments_obj_for_app(application): environments_obj = [] for env in application.environments: - edit_form = None - - if form == None or form.data["id"] != env.id: - edit_form = EditEnvironmentForm(obj=env) - else: - edit_form = form - env_data = { "id": env.id, "name": env.name, - "edit_form": edit_form, + "edit_form": EditEnvironmentForm(obj=env), "members_form": EnvironmentRolesForm(data=data_for_env_members_form(env)), "members": sort_env_users_by_role(env), } @@ -115,9 +108,7 @@ def update_environment(environment_id): form=ApplicationForm( name=application.name, description=application.description ), - environments_obj=get_environments_obj_for_app( - application=application, form=env_form - ), + environments_obj=get_environments_obj_for_app(application=application), ), 400, )