From d784c03eec3cfd0447ba631807305d4c78d252ea Mon Sep 17 00:00:00 2001 From: richard-dds Date: Mon, 1 Oct 2018 11:38:41 -0400 Subject: [PATCH 1/4] Display user names in audit log --- atst/models/user.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/atst/models/user.py b/atst/models/user.py index 1714ba05..8729cba9 100644 --- a/atst/models/user.py +++ b/atst/models/user.py @@ -38,3 +38,7 @@ class User(Base, mixins.TimestampsMixin, mixins.AuditableMixin): return ( Permissions.VIEW_WORKSPACE in self.atat_role.permissions ) or self.workspace_roles + + @property + def displayname(self): + return self.full_name From 3374d8b549e0392808e5e68739e971fc4bec6241 Mon Sep 17 00:00:00 2001 From: richard-dds Date: Mon, 1 Oct 2018 11:39:08 -0400 Subject: [PATCH 2/4] Show workspace info, along with name, on second line --- templates/audit_log.html | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/templates/audit_log.html b/templates/audit_log.html index 2ae23517..e5d8648c 100644 --- a/templates/audit_log.html +++ b/templates/audit_log.html @@ -20,7 +20,16 @@

{{ event.user.full_name if event.user else "ATAT System" }}

- {{ event.activity_description }} + {{ event.action }} {{ event.resource_type }} {{ event.resource_id }} + {% if event.display_name %} + ({{ event.display_name }}) + {% endif %} + +
+ + {% if event.workspace %} + in Workspace {{ event.workspace_id }} ({{ event.workspace.name }}) + {% endif %} From 7f1e8aa27741d1a0a5aad800c0634940976c835f Mon Sep 17 00:00:00 2001 From: richard-dds Date: Mon, 1 Oct 2018 11:42:26 -0400 Subject: [PATCH 3/4] Remove unused properties --- atst/models/audit_event.py | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/atst/models/audit_event.py b/atst/models/audit_event.py index b814bb4a..c08e63ae 100644 --- a/atst/models/audit_event.py +++ b/atst/models/audit_event.py @@ -24,38 +24,6 @@ class AuditEvent(Base, TimestampsMixin): display_name = Column(String()) action = Column(String(), nullable=False) - def __str__(self): - - user_str = ( - "{} performed".format(self.user.full_name) if self.user else "ATAT System" - ) - action_str = "{} on {} {}".format( - self.action, self.resource_type, self.resource_id - ) - display_name_str = "({})".format(self.display_name) if self.display_name else "" - - scope_str = "" - if self.request_id and self.resource_type != "request": - scope_str = "for request {}".format(self.request_id) - elif self.workspace_id and self.resource_type != "workspace": - scope_str = "in workspace {}".format(self.workspace_id) - - return " ".join([user_str, action_str, display_name_str, scope_str]) - - @property - def activity_description(self): - action_str = "{} on {} {}".format( - self.action, self.resource_type, self.resource_id - ) - display_name_str = "({})".format(self.display_name) if self.display_name else "" - scope_str = "" - if self.request_id and self.resource_type != "request": - scope_str = "for request {}".format(self.request_id) - elif self.workspace_id and self.resource_type != "workspace": - scope_str = "in workspace {}".format(self.workspace_id) - - return " ".join([action_str, display_name_str, scope_str]) - def save(self, connection): attrs = inspect(self).dict From d0f4e3426317065c37be027f37b746ead569f367 Mon Sep 17 00:00:00 2001 From: richard-dds Date: Mon, 1 Oct 2018 14:39:33 -0400 Subject: [PATCH 4/4] Display request id and displayname as well --- atst/models/audit_event.py | 1 + templates/audit_log.html | 2 ++ 2 files changed, 3 insertions(+) diff --git a/atst/models/audit_event.py b/atst/models/audit_event.py index c08e63ae..53b4a45e 100644 --- a/atst/models/audit_event.py +++ b/atst/models/audit_event.py @@ -18,6 +18,7 @@ class AuditEvent(Base, TimestampsMixin): workspace = relationship("Workspace", backref="audit_events") request_id = Column(UUID(as_uuid=True), ForeignKey("requests.id"), index=True) + request = relationship("Request", backref="audit_events") resource_type = Column(String(), nullable=False) resource_id = Column(UUID(as_uuid=True), index=True, nullable=False) diff --git a/templates/audit_log.html b/templates/audit_log.html index e5d8648c..7010c0ad 100644 --- a/templates/audit_log.html +++ b/templates/audit_log.html @@ -29,6 +29,8 @@ {% if event.workspace %} in Workspace {{ event.workspace_id }} ({{ event.workspace.name }}) + {% elif event.request %} + on Request {{ event.request_id }} ({{ event.request.displayname }}) {% endif %}