From 25b84a4df683a3ea371d510ef256ac8d3315f3a5 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Mon, 15 Oct 2018 14:02:24 -0400 Subject: [PATCH] Add ProjectForm class that does not include environments for edit project form --- atst/forms/{new_project.py => project.py} | 10 ++++++---- atst/routes/workspaces.py | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) rename atst/forms/{new_project.py => project.py} (93%) diff --git a/atst/forms/new_project.py b/atst/forms/project.py similarity index 93% rename from atst/forms/new_project.py rename to atst/forms/project.py index 00b01325..8d858a59 100644 --- a/atst/forms/new_project.py +++ b/atst/forms/project.py @@ -4,12 +4,14 @@ from wtforms.validators import Required from atst.forms.validators import ListItemRequired, ListItemsUnique -class NewProjectForm(FlaskForm): - - EMPTY_ENVIRONMENT_NAMES = ["", None] - +class ProjectForm(FlaskForm): name = StringField(label="Project Name", validators=[Required()]) description = TextAreaField(label="Description", validators=[Required()]) + + +class NewProjectForm(ProjectForm): + EMPTY_ENVIRONMENT_NAMES = ["", None] + environment_names = FieldList( StringField(label="Environment Name"), validators=[ diff --git a/atst/routes/workspaces.py b/atst/routes/workspaces.py index dd99617c..a3b7a9dc 100644 --- a/atst/routes/workspaces.py +++ b/atst/routes/workspaces.py @@ -17,7 +17,7 @@ from atst.domain.workspaces import Workspaces from atst.domain.workspace_users import WorkspaceUsers from atst.domain.environments import Environments from atst.domain.environment_roles import EnvironmentRoles -from atst.forms.new_project import NewProjectForm +from atst.forms.project import NewProjectForm, ProjectForm from atst.forms.new_member import NewMemberForm from atst.forms.edit_member import EditMemberForm from atst.forms.workspace import WorkspaceForm @@ -196,7 +196,7 @@ def edit_project(workspace_id, project_id): def update_project(workspace_id, project_id): workspace = Workspaces.get_for_update_projects(g.current_user, workspace_id) project = Projects.get(g.current_user, workspace, project_id) - form = NewProjectForm(http_request.form) + form = ProjectForm(http_request.form) if form.validate(): project_data = form.data Projects.update(g.current_user, workspace, project, project_data)