From a91663394339ed0590a7bb04db2c29cfdd6afb8a Mon Sep 17 00:00:00 2001
From: Patrick Smith
Date: Mon, 13 Aug 2018 15:43:07 -0400
Subject: [PATCH 1/2] Update copy on Technical Point of Contact form
---
atst/routes/requests/jedi_request_flow.py | 2 +-
templates/requests/screen-3.html | 17 ++++++++---------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/atst/routes/requests/jedi_request_flow.py b/atst/routes/requests/jedi_request_flow.py
index 6623a909..199be16f 100644
--- a/atst/routes/requests/jedi_request_flow.py
+++ b/atst/routes/requests/jedi_request_flow.py
@@ -120,7 +120,7 @@ class JEDIRequestFlow(object):
"show": True,
},
{
- "title": "Primary Point of Contact",
+ "title": "Workspace Owner",
"section": "primary_poc",
"form": POCForm,
"show": True,
diff --git a/templates/requests/screen-3.html b/templates/requests/screen-3.html
index 8971215c..2f03c8bf 100644
--- a/templates/requests/screen-3.html
+++ b/templates/requests/screen-3.html
@@ -4,7 +4,7 @@
{% from "components/text_input.html" import TextInput %}
{% block subtitle %}
-Primary Government/Military
Point of Contact (POC)
+Designate a Workspace Owner
{% endblock %}
{% block form %}
@@ -16,18 +16,17 @@
) }}
{% endif %}
-Please designate a Primary Point of Contact that will be responsible for owning the workspace in the JEDI Cloud.
-The Point of Contact will become the primary owner of the workspace created to use the JEDI Cloud. As a workspace owner, this person will have the ability to:
+
The Workspace Owner is the primary point of contact and technical administrator of the JEDI Workspace and will have the following responsibilities:
- - Create multiple application stacks and environments in the workspace to access the commercial cloud service provider portal
- - Add and manage users in the workspace
- - View the budget and billing history related to this workspace
- - Manage access to the Cloud Service Provider's Console
- - Transfer Workspace ownership to another person
+ - Organize your cloud-hosted systems into projects and environments
+ - Add users to this workspace and manage members
+ - Manage access to the JEDI Cloud service provider’s portal
- This POC may be you.
+This person must be a DoD employee (not a contractor).
+The Workspace Owner may be you. You will be able to add other administrators later. This person will be invited via email once your request is approved.
+
{{ TextInput(f.fname_poc,placeholder='First Name') }}
{{ TextInput(f.lname_poc,placeholder='Last Name') }}
{{ TextInput(f.email_poc,placeholder='jane@mail.mil', validation='email') }}
From 53ff951913e84ec6b44bf56c963693168d42cf54 Mon Sep 17 00:00:00 2001
From: Patrick Smith
Date: Mon, 13 Aug 2018 15:52:14 -0400
Subject: [PATCH 2/2] Remove "POC" from workspace owner form field labels
---
atst/forms/poc.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/atst/forms/poc.py b/atst/forms/poc.py
index c595097b..3dcdc223 100644
--- a/atst/forms/poc.py
+++ b/atst/forms/poc.py
@@ -6,11 +6,11 @@ from .validators import IsNumber
class POCForm(ValidatedForm):
- fname_poc = StringField("POC First Name", validators=[Required()])
+ fname_poc = StringField("First Name", validators=[Required()])
- lname_poc = StringField("POC Last Name", validators=[Required()])
+ lname_poc = StringField("Last Name", validators=[Required()])
- email_poc = EmailField("POC Email Address", validators=[Required(), Email()])
+ email_poc = EmailField("Email Address", validators=[Required(), Email()])
dodid_poc = StringField(
"DOD ID", validators=[Required(), Length(min=10), IsNumber()]