pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Our invalid forms are blocked via JS now

Browse Source
This commit is contained in:
George Drummond 2019-05-03 11:36:00 -04:00
parent 645c217fbe
commit 094550f99c
No known key found for this signature in database
GPG Key ID: 296DD6077123BF17
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
atst/forms/application.py
View File

@ -1,12 +1,11 @@
from .forms import BaseForm 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 wtforms.validators import Required
from atst.forms.validators import ListItemRequired, ListItemsUnique from atst.forms.validators import ListItemRequired, ListItemsUnique
from atst.utils.localization import translate from atst.utils.localization import translate
class EditEnvironmentForm(BaseForm): class EditEnvironmentForm(BaseForm):
id = HiddenField()
name = StringField( name = StringField(
label=translate("forms.environments.name_label"), validators=[Required()] label=translate("forms.environments.name_label"), validators=[Required()]
) )

15
atst/routes/applications/settings.py
View File

@ -13,20 +13,13 @@ from atst.models.permissions import Permissions
from atst.utils.flash import formatted_flash as flash 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 = [] environments_obj = []
for env in application.environments: 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 = { env_data = {
"id": env.id, "id": env.id,
"name": env.name, "name": env.name,
"edit_form": edit_form, "edit_form": EditEnvironmentForm(obj=env),
"members_form": EnvironmentRolesForm(data=data_for_env_members_form(env)), "members_form": EnvironmentRolesForm(data=data_for_env_members_form(env)),
"members": sort_env_users_by_role(env), "members": sort_env_users_by_role(env),
} }
@ -115,9 +108,7 @@ def update_environment(environment_id):
form=ApplicationForm( form=ApplicationForm(
name=application.name, description=application.description name=application.name, description=application.description
), ),
environments_obj=get_environments_obj_for_app( environments_obj=get_environments_obj_for_app(application=application),
application=application, form=env_form
),
), ),
400, 400,
) )