From 365a60015235068afaca5005a4ff4dfc46a5c29e Mon Sep 17 00:00:00 2001 From: richard-dds Date: Thu, 15 Nov 2018 16:03:40 -0500 Subject: [PATCH] Cache new request form data --- atst/routes/requests/financial_verification.py | 4 ++-- atst/routes/requests/requests_form.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/atst/routes/requests/financial_verification.py b/atst/routes/requests/financial_verification.py index 9f939ea0..dc2f10c0 100644 --- a/atst/routes/requests/financial_verification.py +++ b/atst/routes/requests/financial_verification.py @@ -13,7 +13,7 @@ from atst.domain.requests.financial_verification import ( ) from atst.models.attachment import Attachment from atst.domain.task_orders import TaskOrders -from atst.utils.form_cache import retrieve_form_data +from atst.utils.form_cache import FormCache def fv_extended(_http_request): @@ -95,7 +95,7 @@ class FinancialVerificationBase(object): def existing_form_data(): key = http_request.args.get("formCache") if key: - return retrieve_form_data(app.redis, key) + return FormCache(app.redis).read(key) class GetFinancialVerificationForm(FinancialVerificationBase): diff --git a/atst/routes/requests/requests_form.py b/atst/routes/requests/requests_form.py index c88c1c38..e1bb022c 100644 --- a/atst/routes/requests/requests_form.py +++ b/atst/routes/requests/requests_form.py @@ -1,4 +1,4 @@ -from flask import g, redirect, render_template, url_for, request as http_request +from flask import g, redirect, render_template, url_for, request as http_request, current_app from . import requests_bp from atst.domain.requests import Requests @@ -29,7 +29,8 @@ def option_data(): @requests_bp.route("/requests/new/", methods=["GET"]) def requests_form_new(screen): - jedi_flow = JEDIRequestFlow(screen, request=None, current_user=g.current_user) + cached_data = current_app.form_cache.from_request(http_request) + jedi_flow = JEDIRequestFlow(screen, request=None, current_user=g.current_user, post_data=cached_data) return render_template( "requests/screen-%d.html" % int(screen),