pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only display "in workspace x" resource isn't a workspace

Browse Source
This commit is contained in:
richard-dds 2018-09-24 11:56:50 -04:00
parent 004985057c
commit b2c59f39ef
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
atst/models/audit_event.py
View File

@ -24,12 +24,18 @@ class AuditEvent(Base, TimestampsMixin):
def __str__(self): def __str__(self):
user_str = "{} performed".format(self.user.full_name) if self.user else "ATAT System" user_str = (
"{} performed".format(self.user.full_name) if self.user else "ATAT System"
)
action_str = "{} on {} {}".format( action_str = "{} on {} {}".format(
self.action, self.resource_type, self.resource_id self.action, self.resource_type, self.resource_id
) )
display_name_str = "({})".format(self.display_name) if self.display_name else "" display_name_str = "({})".format(self.display_name) if self.display_name else ""
workspace_str = "in workspace {}".format(self.workspace_id) if self.workspace_id else "" workspace_str = (
"in workspace {}".format(self.workspace_id)
if self.workspace_id and self.resource_type != "workspace"
else ""
)
return " ".join([user_str, action_str, display_name_str, workspace_str]) return " ".join([user_str, action_str, display_name_str, workspace_str])