diff --git a/atst/app.py b/atst/app.py index 444f7032..3ee0bd48 100644 --- a/atst/app.py +++ b/atst/app.py @@ -64,9 +64,12 @@ def make_app(config): make_error_pages(app) app.register_blueprint(bp) app.register_blueprint(workspace_routes) - app.register_blueprint(requests_bp) app.register_blueprint(task_orders_bp) app.register_blueprint(user_routes) + + if app.config.get("REQUESTS_WORKFLOW"): + app.register_blueprint(requests_bp) + if ENV != "prod": app.register_blueprint(dev_routes) @@ -131,6 +134,7 @@ 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 7581eed3..92a3831f 100644 --- a/atst/routes/__init__.py +++ b/atst/routes/__init__.py @@ -48,13 +48,19 @@ 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("requests.requests_index")) + return redirect(url_for(resource_index)) num_workspaces = len(user.workspace_roles) if num_workspaces == 0: - return redirect(url_for("requests.requests_index")) + return redirect(url_for(resource_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 ab075e1d..ad1f9dd9 100644 --- a/config/base.ini +++ b/config/base.ini @@ -25,3 +25,4 @@ SESSION_USE_SIGNER = True STORAGE_CONTAINER=uploads STORAGE_PROVIDER=LOCAL WTF_CSRF_ENABLED = true +REQUESTS_WORKFLOW=false diff --git a/config/ci.ini b/config/ci.ini index 3ee7f480..0c7e23fa 100644 --- a/config/ci.ini +++ b/config/ci.ini @@ -4,3 +4,4 @@ PGDATABASE = atat_test REDIS_URI = redis://redishost:6379 CRL_DIRECTORY = tests/fixtures/crl WTF_CSRF_ENABLED = false +REQUESTS_WORKFLOW=true diff --git a/config/test.ini b/config/test.ini index 3da77886..12639e91 100644 --- a/config/test.ini +++ b/config/test.ini @@ -4,3 +4,4 @@ PGDATABASE = atat_test CRL_DIRECTORY = tests/fixtures/crl WTF_CSRF_ENABLED = false STORAGE_PROVIDER=LOCAL +REQUESTS_WORKFLOW=true diff --git a/templates/navigation/global_navigation.html b/templates/navigation/global_navigation.html index a87c329d..04f9bb3a 100644 --- a/templates/navigation/global_navigation.html +++ b/templates/navigation/global_navigation.html @@ -2,14 +2,16 @@