From 02c66b74b1300c28e2fe0a4319ab2eb53a00dad7 Mon Sep 17 00:00:00 2001 From: richard-dds Date: Thu, 2 Aug 2018 12:53:01 -0400 Subject: [PATCH] Actually fix request form flow --- atst/routes/requests/__init__.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/atst/routes/requests/__init__.py b/atst/routes/requests/__init__.py index 114f8239..8891ccbc 100644 --- a/atst/routes/requests/__init__.py +++ b/atst/routes/requests/__init__.py @@ -39,11 +39,23 @@ def requests_index(): return render_template("requests.html", requests=mapped_requests) +@requests_bp.route("/requests/new", defaults={"screen": 1}) @requests_bp.route("/requests/new/", methods=["GET"]) -def requests_form_new(): - pass +def requests_form_new(screen): + jedi_flow = JEDIRequestFlow(screen, request=None) + + return render_template( + "requests/screen-%d.html" % int(screen), + f=jedi_flow.form, + data=jedi_flow.current_step_data, + screens=jedi_flow.screens, + current=screen, + next_screen=screen + 1, + can_submit=jedi_flow.can_submit, + ) +@requests_bp.route("/requests/new/", methods=["GET"], defaults={"request_id": None}) @requests_bp.route("/requests/new//", methods=["GET"]) def requests_form_update(screen=1, request_id=None): request = Requests.get(request_id) if request_id is not None else None @@ -61,6 +73,7 @@ def requests_form_update(screen=1, request_id=None): ) +@requests_bp.route("/requests/new/", methods=["POST"], defaults={"request_id": None}) @requests_bp.route("/requests/new//", methods=["POST"]) def requests_update(screen=1, request_id=None): screen = int(screen)