From 31d85be949687756daab12667ac2b14af9fd6c92 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Tue, 8 Jan 2019 09:41:16 -0500 Subject: [PATCH] Update to use workspace permissions --- atst/domain/audit_log.py | 11 +++++++---- atst/routes/workspaces/index.py | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/atst/domain/audit_log.py b/atst/domain/audit_log.py index 5c2835b6..b15af1c3 100644 --- a/atst/domain/audit_log.py +++ b/atst/domain/audit_log.py @@ -35,11 +35,14 @@ class AuditLog(object): return AuditEventQuery.get_all(pagination_opts) @classmethod - def get_workspace_events(cls, user, workspace_id, pagination_opts): - Authorization.check_atat_permission( - user, Permissions.VIEW_WORKSPACE_AUDIT_LOG, "view audit log" + def get_workspace_events(cls, user, workspace, pagination_opts=None): + Authorization.check_workspace_permission( + user, + workspace, + Permissions.VIEW_WORKSPACE_AUDIT_LOG, + "view workspace audit log", ) - return AuditEventQuery.get_ws_events(workspace_id, pagination_opts) + return AuditEventQuery.get_ws_events(workspace.id, pagination_opts) @classmethod def get_by_resource(cls, resource_id): diff --git a/atst/routes/workspaces/index.py b/atst/routes/workspaces/index.py index e89fe644..d8ba7159 100644 --- a/atst/routes/workspaces/index.py +++ b/atst/routes/workspaces/index.py @@ -95,7 +95,7 @@ def workspace_activity(workspace_id): ) pagination_opts = Paginator.get_pagination_opts(http_request) audit_events = AuditLog.get_workspace_events( - g.current_user, workspace_id, pagination_opts + g.current_user, workspace, pagination_opts ) return render_template(