tests for new task order endpoints, remove new workspace routes

This commit is contained in:
dandds
2018-12-18 13:22:54 -05:00
parent 9a12c14636
commit ad03b58dee
7 changed files with 97 additions and 87 deletions

View File

@@ -1,4 +1,11 @@
from flask import Blueprint, request as http_request, render_template, g, redirect, url_for
from flask import (
Blueprint,
request as http_request,
render_template,
g,
redirect,
url_for,
)
from atst.domain.task_orders import TaskOrders
from atst.domain.workspaces import Workspaces
@@ -77,7 +84,6 @@ class ShowTaskOrderWorkflow:
return screen_info
class UpdateTaskOrderWorkflow(ShowTaskOrderWorkflow):
def __init__(self, form_data, user, screen=1, task_order_id=None):
self.form_data = form_data
@@ -129,7 +135,13 @@ def update(screen, task_order_id=None):
if workflow.validate():
workflow.update()
return redirect(url_for("task_orders.new", screen=screen+1, task_order_id=workflow.task_order.id))
return redirect(
url_for(
"task_orders.new",
screen=screen + 1,
task_order_id=workflow.task_order.id,
)
)
else:
return render_template(
workflow.template,

View File

@@ -6,7 +6,6 @@ from . import index
from . import projects
from . import members
from . import invitations
from . import new
from atst.domain.exceptions import UnauthorizedError
from atst.domain.workspaces import Workspaces
from atst.domain.authz import Authorization

View File

@@ -1,23 +0,0 @@
from flask import g, redirect, url_for, render_template, request as http_request
from . import workspaces_bp
from atst.domain.task_orders import TaskOrders
from atst.domain.workspaces import Workspaces
from atst.forms.workspace import WorkspaceForm
@workspaces_bp.route("/workspaces/new")
def new():
form = WorkspaceForm()
return render_template("workspaces/new.html", form=form)
@workspaces_bp.route("/workspaces/new", methods=["POST"])
def create():
form = WorkspaceForm(http_request.form)
if form.validate():
ws = Workspaces.create(g.current_user, form.name.data)
task_order = TaskOrders.create(workspace=ws, creator=g.current_user)
return redirect(url_for("task_orders.edit", task_order_id=task_order.id))
else:
return render_template("workspaces/new.html", form=form)