From 68a1ffde8b774d1dde507e67443fd4420a9c5c2e Mon Sep 17 00:00:00 2001 From: Montana Date: Thu, 28 Feb 2019 11:18:09 -0500 Subject: [PATCH] Portfolio Name and Defense Component read only on TOs that are started from existing portfolios --- atst/routes/task_orders/new.py | 5 +++++ templates/portfolios/task_orders/index.html | 2 +- templates/task_orders/new/app_info.html | 15 +++++++++++---- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/atst/routes/task_orders/new.py b/atst/routes/task_orders/new.py index 77cb0c63..235e5384 100644 --- a/atst/routes/task_orders/new.py +++ b/atst/routes/task_orders/new.py @@ -237,6 +237,11 @@ def new(screen, task_order_id=None, portfolio_id=None): task_order_id=task_order_id, ) url_args["next"] = template_args["next"] + elif http_request.args.get("new_to_on_portfolio"): + portfolio = Portfolios.get(g.current_user, portfolio_id) + template_args["portfolio_name"] = portfolio.name + template_args["defense_component"] = portfolio.defense_component + template_args["new_to_on_portfolio"] = True template_args["action_url"] = url_for("task_orders.update", **url_args) diff --git a/templates/portfolios/task_orders/index.html b/templates/portfolios/task_orders/index.html index c26bd969..002111be 100644 --- a/templates/portfolios/task_orders/index.html +++ b/templates/portfolios/task_orders/index.html @@ -93,7 +93,7 @@
{% for task_order in pending_task_orders %} diff --git a/templates/task_orders/new/app_info.html b/templates/task_orders/new/app_info.html index ee8fe008..22204840 100644 --- a/templates/task_orders/new/app_info.html +++ b/templates/task_orders/new/app_info.html @@ -4,6 +4,7 @@ {% from "components/options_input.html" import OptionsInput %} {% from "components/date_input.html" import DateInput %} {% from "components/multi_checkbox_input.html" import MultiCheckboxInput %} +{% from "components/review_field.html" import ReviewField %} {% block heading %} {{ "task_orders.new.app_info.section_title"| translate }} @@ -14,11 +15,17 @@

{{ "task_orders.new.app_info.basic_info_title"| translate }}

-{{ TextInput(form.portfolio_name, placeholder="The name of your office or organization", validation="portfolioName") }} -{{ TextInput(form.scope, paragraph=True) }} -

{{ "task_orders.new.app_info.sample_scope" | translate | safe }}

+ +{% if new_to_on_portfolio %} + {{ ReviewField(heading="forms.portfolio.name_label" | translate, field=portfolio_name) }} +{% else %} + {{ TextInput(form.portfolio_name, placeholder="The name of your office or organization", validation="portfolioName") }} + {{ TextInput(form.scope, paragraph=True) }} +

{{ "task_orders.new.app_info.sample_scope" | translate | safe }}

+{% endif %} +
- {{ OptionsInput(form.defense_component) }} + {{ ReviewField(heading="forms.task_order.defense_component_label" | translate, field=defense_component) if new_to_on_portfolio else OptionsInput(form.defense_component) }}