diff --git a/README.md b/README.md index 9c31fc19..5fdbf6d3 100644 --- a/README.md +++ b/README.md @@ -254,6 +254,7 @@ To generate coverage reports for the Javascript tests: - `SECRET_KEY`: String key which will be used to sign the session cookie. Should be a long string of random bytes. https://flask.palletsprojects.com/en/1.1.x/config/#SECRET_KEY - `SERVER_NAME`: Hostname for ATAT. Only needs to be specified in contexts where the hostname cannot be inferred from the request, such as Celery workers. https://flask.palletsprojects.com/en/1.1.x/config/#SERVER_NAME - `SESSION_COOKIE_NAME`: String value specifying the name to use for the session cookie. https://flask.palletsprojects.com/en/1.1.x/config/#SESSION_COOKIE_NAME +- `SESSION_COOKIE_DOMAIN`: String value specifying the name to use for the session cookie. This should be set to the root domain so that it is valid for both the main site and the authentication subdomain. https://flask.palletsprojects.com/en/1.1.x/config/#SESSION_COOKIE_DOMAIN - `SESSION_TYPE`: String value specifying the cookie storage backend. https://pythonhosted.org/Flask-Session/ - `SESSION_USE_SIGNER`: Boolean value specifying if the cookie sid should be signed. - `SQLALCHEMY_ECHO`: Boolean value specifying if SQLAlchemy should log queries to stdout. diff --git a/config/base.ini b/config/base.ini index 0feba51f..9233ef21 100644 --- a/config/base.ini +++ b/config/base.ini @@ -40,6 +40,7 @@ REDIS_USER SECRET_KEY = change_me_into_something_secret SERVER_NAME SESSION_COOKIE_NAME=atat +SESSION_COOKIE_DOMAIN SESSION_TYPE = redis SESSION_USE_SIGNER = True SQLALCHEMY_ECHO = False diff --git a/deploy/azure/atst-envvars-configmap.yml b/deploy/azure/atst-envvars-configmap.yml index d2b0ba45..6f412a3d 100644 --- a/deploy/azure/atst-envvars-configmap.yml +++ b/deploy/azure/atst-envvars-configmap.yml @@ -30,6 +30,7 @@ data: PGUSER: atat_master@atat-db REDIS_HOST: atat.redis.cache.windows.net:6380 REDIS_TLS: "true" + SESSION_COOKIE_DOMAIN: atat.code.mil STATIC_URL: https://atat-cdn.azureedge.net/static/ TZ: UTC UWSGI_CONFIG_FULLPATH: /opt/atat/atst/uwsgi.ini diff --git a/templates/task_orders/fragments/task_order_view.html b/templates/task_orders/fragments/task_order_view.html index d0082a31..cfa2fcb3 100644 --- a/templates/task_orders/fragments/task_order_view.html +++ b/templates/task_orders/fragments/task_order_view.html @@ -75,7 +75,7 @@ {{ clin.number }} {{ clin.type }} - {{ "{}".format(clin.jedi_clin_type) | translate}} + {{ "task_orders.review.clins.{}".format(clin.jedi_clin_type) | translate}} {{ clin.start_date | formattedDate }} - {{ clin.end_date | formattedDate }} diff --git a/translations.yaml b/translations.yaml index a9407720..5f00a464 100644 --- a/translations.yaml +++ b/translations.yaml @@ -492,6 +492,11 @@ task_orders: pop: PoP total_amount: CLIN Value obligated: Amount Obligated + JEDICLINType: + JEDI_CLIN_1: 'Unclassified IaaS and PaaS (IDIQ CLIN 0001)' + JEDI_CLIN_2: 'Classified IaaS and PaaS (IDIQ CLIN 0002)' + JEDI_CLIN_3: 'Unclassified Cloud Support Package (IDIQ CLIN 0003)' + JEDI_CLIN_4: 'Classified Cloud Support Package (IDIQ CLIN 0004)' tooltip: obligated_funds: Funds committed to fund your portfolio. This may represent 100% of your total Task Order value, or a portion of it. total_value: All obligated and projected funds for the Task Order’s Base and Option CLINs. @@ -555,10 +560,10 @@ task_orders: status_empty_state: 'This Portfolio has no {status} Task Orders.' status_list_title: '{status} Task Orders' JEDICLINType: - JEDI_CLIN_1: 'Unclassified IaaS and PaaS (IDIQ CLIN 0001)' - JEDI_CLIN_2: 'Classified IaaS and PaaS (IDIQ CLIN 0002)' - JEDI_CLIN_3: 'Unclassified Cloud Support Package (IDIQ CLIN 0003)' - JEDI_CLIN_4: 'Classified Cloud Support Package (IDIQ CLIN 0004)' + JEDI_CLIN_1: 'IDIQ CLIN 0001 Unclassified IaaS/PaaS' + JEDI_CLIN_2: 'IDIQ CLIN 0002 Classified IaaS/PaaS' + JEDI_CLIN_3: 'IDIQ CLIN 0003 Unclassified Cloud Support Package' + JEDI_CLIN_4: 'IDIQ CLIN 0004 Classified Cloud Support Package' testing: example_string: Hello World example_with_variables: 'Hello, {name}!'