pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Preserve data on back navigation

Browse Source
This commit is contained in:
Montana 2019-03-07 15:33:36 -05:00
parent 93545d2dc9
commit 7fb9a7572c
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
atst/routes/task_orders/new.py
View File

@ -155,8 +155,8 @@ class UpdateTaskOrderWorkflow(ShowTaskOrderWorkflow):
@property @property
def form(self): def form(self):
if self.screen == 1 and self.portfolio_id: if not self.can_edit_pf_attributes(self.portfolio_id) and self.screen == 1:
return task_order_form.AppInfoWithExistingPortfolioForm() return task_order_form.AppInfoWithExistingPortfolioForm(self.form_data)
return self._form return self._form
@property @property
@ -234,25 +234,19 @@ def new(screen, task_order_id=None, portfolio_id=None):
"form": workflow.form, "form": workflow.form,
"complete": workflow.is_complete, "complete": workflow.is_complete,
} }
if not workflow.can_edit_pf_attributes(portfolio_id):
template_args["portfolio"] = workflow.get_portfolio(
user=g.current_user, portfolio_id=portfolio_id
)
if not workflow.can_edit_pf_attributes(portfolio_id): if not workflow.can_edit_pf_attributes(portfolio_id):
template_args["portfolio"] = workflow.get_portfolio(portfolio_id=portfolio_id) template_args["portfolio"] = workflow.get_portfolio(portfolio_id=portfolio_id)
if screen == 1:
workflow.form = task_order_form.AppInfoWithExistingPortfolioForm(
obj=workflow.task_order
)
if task_order_id and screen is 4: if task_order_id and screen is 4:
task_order = TaskOrders.get(g.current_user, task_order_id) task_order = TaskOrders.get(g.current_user, task_order_id)
if not TaskOrders.all_sections_complete(task_order): if not TaskOrders.all_sections_complete(task_order):
flash("task_order_draft") flash("task_order_draft")
if screen == 1:
if portfolio_id or workflow.task_order.portfolio.num_task_orders > 1:
workflow.form = task_order_form.AppInfoWithExistingPortfolioForm(
obj=workflow.task_order
)
url_args = {"screen": screen} url_args = {"screen": screen}
if task_order_id: if task_order_id:
url_args["task_order_id"] = task_order_id url_args["task_order_id"] = task_order_id