Fixup after rebase

atst/models/environment_role.py

@@ -31,18 +31,18 @@ class EnvironmentRole(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
 
     @property
     def history(self):
-        previous_state = mixins.AuditableMixin.get_history(self)
+        previous_state = self.get_changes()
-        auditable_previous_state = {}
+        change_set = {}
         if "role" in previous_state:
-            from_role = previous_state["role"]
+            from_role = previous_state["role"][0]
             to_role = self.role
-            auditable_previous_state["role"] = [from_role, to_role]
+            change_set["role"] = [from_role, to_role]
-        return auditable_previous_state
+        return change_set
 
     @property
     def event_details(self):
         return {
-            "updated_user": self.user.displayname,
+            "updated_user_name": self.user.displayname,
             "updated_user_id": str(self.user_id),
             "environment": self.environment.displayname,
             "environment_id": str(self.environment_id),

atst/models/mixins/auditable.py

@@ -52,15 +52,12 @@ class AuditableMixin(object):
 
     @staticmethod
     def audit_update(mapper, connection, target):
-        if AuditableMixin.get_history(target):
+        if AuditableMixin.get_changes(target):
             target.create_audit_event(connection, target, ACTION_UPDATE)
 
     def get_changes(self):
         """
-        This function borrows largely from a gist:
+        This function returns a dictionary of the form {item: [from_value, to_value]},
-        https://gist.github.com/ngse/c20058116b8044c65d3fbceda3fdf423#file-audit_mixin-py-L106-L120
-
-        It returns a dictionary of the form {item: [from_value, to_value]},
         where 'item' is the attribute on the target that has been updated,
         'from_value' is the value of the attribute before it was updated,
         and 'to_value' is the current value of the attribute.

templates/audit_log.html

@@ -30,8 +30,6 @@
 
               {% if event.event_details %}
                 for User <code>{{ event.event_details.updated_user_id }}</code> ({{ event.event_details.updated_user_name }})
-                <br>
-              {% endif %}
 
                 {% if event.event_details["environment"] %}
                   <br>
@@ -50,7 +48,7 @@
                 on Request <code>{{ event.request_id }}</code> ({{ event.request.displayname }})
               {% endif %}
 
-              {% if event.changed_state %}
+              {% if event.changed_state.role %}
                 from {{ event.changed_state.role[0] }} to {{ event.changed_state.role[1] }}
                 <br>
               {% endif %}