diff --git a/atst/app.py b/atst/app.py index 3ee0bd48..a1c5d1d4 100644 --- a/atst/app.py +++ b/atst/app.py @@ -66,9 +66,7 @@ def make_app(config): app.register_blueprint(workspace_routes) app.register_blueprint(task_orders_bp) app.register_blueprint(user_routes) - - if app.config.get("REQUESTS_WORKFLOW"): - app.register_blueprint(requests_bp) + app.register_blueprint(requests_bp) if ENV != "prod": app.register_blueprint(dev_routes) @@ -134,7 +132,6 @@ def map_config(config): "REQUIRE_CRLS": config.getboolean("default", "REQUIRE_CRLS"), "RQ_REDIS_URL": config["default"]["REDIS_URI"], "RQ_QUEUES": [config["default"]["RQ_QUEUES"]], - "REQUESTS_WORKFLOW": config.getboolean("default", "REQUESTS_WORKFLOW"), } diff --git a/atst/routes/__init__.py b/atst/routes/__init__.py index 92a3831f..7581eed3 100644 --- a/atst/routes/__init__.py +++ b/atst/routes/__init__.py @@ -48,19 +48,13 @@ def helpdocs(doc=None): def home(): user = g.current_user - resource_index = ( - "requests.requests_index" - if app.config.get("REQUESTS_WORKFLOW") - else "workspaces.workspaces" - ) - if user.atat_role_name == "ccpo": - return redirect(url_for(resource_index)) + return redirect(url_for("requests.requests_index")) num_workspaces = len(user.workspace_roles) if num_workspaces == 0: - return redirect(url_for(resource_index)) + return redirect(url_for("requests.requests_index")) elif num_workspaces == 1: workspace_role = user.workspace_roles[0] workspace_id = workspace_role.workspace.id diff --git a/config/base.ini b/config/base.ini index ad1f9dd9..ab075e1d 100644 --- a/config/base.ini +++ b/config/base.ini @@ -25,4 +25,3 @@ SESSION_USE_SIGNER = True STORAGE_CONTAINER=uploads STORAGE_PROVIDER=LOCAL WTF_CSRF_ENABLED = true -REQUESTS_WORKFLOW=false diff --git a/templates/about.html b/templates/about.html index 7546ffdc..083d9cc1 100644 --- a/templates/about.html +++ b/templates/about.html @@ -15,9 +15,6 @@ JEDI Cloud provides commercial Infrastructure as a Service (IaaS) and Platform as a Service (PaaS) offerings to support DoD business and mission operations.
Anyone with a DoD mission may use JEDI.

- {% if config.get("REQUESTS_WORKFLOW") %} - New JEDI Request - {% endif %}

Five Steps to the JEDI Cloud

@@ -29,9 +26,6 @@

Complete a JEDI Cloud Access Request

A JEDI Cloud Access Request will inform the the Cloud Computing Program Office (CCPO) about your intention to use JEDI's commercial cloud services and provide the preliminary information needed to grant access. - {% if config.get("REQUESTS_WORKFLOW") %} - Any DoD employee with a CAC may initiate this request. Start a Request - {% endif %}

  • diff --git a/templates/navigation/global_navigation.html b/templates/navigation/global_navigation.html index 04f9bb3a..c0c43cf2 100644 --- a/templates/navigation/global_navigation.html +++ b/templates/navigation/global_navigation.html @@ -2,17 +2,6 @@