From 1b329b96599c87687e70009da7e0954ca7a47be0 Mon Sep 17 00:00:00 2001 From: Montana Date: Fri, 8 Mar 2019 10:54:00 -0500 Subject: [PATCH] Move form logic into ShowTaskOrderPortfolio class --- atst/routes/task_orders/new.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/atst/routes/task_orders/new.py b/atst/routes/task_orders/new.py index ee874ab4..b0dfb586 100644 --- a/atst/routes/task_orders/new.py +++ b/atst/routes/task_orders/new.py @@ -97,6 +97,11 @@ class ShowTaskOrderWorkflow: else: self._form = self._section[form_type]() + if self.pf_attributes_read_only() and self.screen == 1: + self._form = task_order_form.AppInfoWithExistingPortfolioForm( + obj=self.task_order + ) + return self._form @form.setter @@ -238,17 +243,13 @@ def new(screen, task_order_id=None, portfolio_id=None): "complete": workflow.is_complete, } - if workflow.pf_attributes_read_only(): - template_args["portfolio"] = workflow.portfolio - if screen == 1: - workflow.form = task_order_form.AppInfoWithExistingPortfolioForm( - obj=workflow.task_order - ) - if task_order_id and screen is 4: if not TaskOrders.all_sections_complete(workflow.task_order): flash("task_order_draft") + if workflow.pf_attributes_read_only(): + template_args["portfolio"] = workflow.portfolio + url_args = {"screen": screen} if task_order_id: url_args["task_order_id"] = task_order_id