diff --git a/atst/app.py b/atst/app.py index 8ad78a3e..4be64f58 100644 --- a/atst/app.py +++ b/atst/app.py @@ -150,9 +150,7 @@ def set_default_headers(app): # pragma: no cover def map_config(config): return { **config["default"], - "AUDIT_LOG_FEATURE_TOGGLE": config["default"].getboolean( - "AUDIT_LOG_FEATURE_TOGGLE" - ), + "USE_AUDIT_LOG": config["default"].getboolean("USE_AUDIT_LOG"), "ENV": config["default"]["ENVIRONMENT"], "BROKER_URL": config["default"]["REDIS_URI"], "DEBUG": config["default"].getboolean("DEBUG"), diff --git a/atst/models/mixins/auditable.py b/atst/models/mixins/auditable.py index b2a3f527..30567547 100644 --- a/atst/models/mixins/auditable.py +++ b/atst/models/mixins/auditable.py @@ -37,7 +37,7 @@ class AuditableMixin(object): }, ) - if app.config.get("AUDIT_LOG_FEATURE_TOGGLE", False): + if app.config.get("USE_AUDIT_LOG", False): audit_event = AuditEvent(**log_data) audit_event.save(connection) diff --git a/atst/routes/ccpo.py b/atst/routes/ccpo.py index bb627eea..9e8dc155 100644 --- a/atst/routes/ccpo.py +++ b/atst/routes/ccpo.py @@ -24,7 +24,7 @@ bp.context_processor(atat_context_processor) @bp.route("/activity-history") @user_can(Permissions.VIEW_AUDIT_LOG, message="view activity log") def activity_history(): - if app.config.get("AUDIT_LOG_FEATURE_TOGGLE", False): + if app.config.get("USE_AUDIT_LOG", False): pagination_opts = Paginator.get_pagination_opts(request) audit_events = AuditLog.get_all_events(pagination_opts) return render_template("audit_log/audit_log.html", audit_events=audit_events) diff --git a/config/base.ini b/config/base.ini index d34d3991..7fcdd19f 100644 --- a/config/base.ini +++ b/config/base.ini @@ -1,5 +1,5 @@ [default] -AUDIT_LOG_FEATURE_TOGGLE = false +USE_AUDIT_LOG = false CAC_URL = http://localhost:8000/login-redirect CA_CHAIN = ssl/server-certs/ca-chain.pem CLASSIFIED = false diff --git a/templates/applications/settings.html b/templates/applications/settings.html index ba9ba537..fe6ac908 100644 --- a/templates/applications/settings.html +++ b/templates/applications/settings.html @@ -117,7 +117,7 @@