From e5f183218cb3dd3d2c3fef1440fd478520a9454d Mon Sep 17 00:00:00 2001
From: Montana <montana-ctr@friends.dds.mil>
Date: Wed, 14 Nov 2018 16:09:08 -0500
Subject: [PATCH] Display audit log event with all information

---
 atst/models/environment_role.py |  4 ++--
 templates/audit_log.html        | 17 ++++++++++++++---
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/atst/models/environment_role.py b/atst/models/environment_role.py
index 3ae37656..bbbcde5f 100644
--- a/atst/models/environment_role.py
+++ b/atst/models/environment_role.py
@@ -44,8 +44,8 @@ class EnvironmentRole(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
         return {
             "updated_user": self.user.displayname,
             "updated_user_id": str(self.user_id),
-            "env": self.environment.displayname,
-            "env_id": str(self.environment_id),
+            "environment": self.environment.displayname,
+            "environment_id": str(self.environment_id),
             "project": self.environment.project.name,
             "project_id": str(self.environment.project_id),
             "workspace": self.environment.project.workspace.name,
diff --git a/templates/audit_log.html b/templates/audit_log.html
index 5e679dfe..ba3eae10 100644
--- a/templates/audit_log.html
+++ b/templates/audit_log.html
@@ -33,9 +33,15 @@
                 <br>
               {% endif %}
 
-              {% if event.changed_state %}
-                from {{ event.changed_state.role[0] }} to {{ event.changed_state.role[1] }}
-                <br>
+                {% if event.event_details["environment"] %}
+                  <br>
+                  in Environment <code>{{ event.event_details["environment_id"] }}</code> ({{ event.event_details["environment"] }})
+                  <br>
+                  in Project <code>{{ event.event_details["project_id"] }}</code> ({{ event.event_details["project"] }})
+                  <br>
+                  in Workspace <code>{{ event.event_details["workspace_id"] }}</code> ({{ event.event_details["workspace"] }})
+                {% endif %}
+              <br>
               {% endif %}
 
               {% if event.workspace %}
@@ -43,6 +49,11 @@
               {% elif event.request %}
                 on Request <code>{{ event.request_id }}</code> ({{ event.request.displayname }})
               {% endif %}
+
+              {% if event.changed_state %}
+                from {{ event.changed_state.role[0] }} to {{ event.changed_state.role[1] }}
+                <br>
+              {% endif %}
             </div>
           </article>
         </li>