From adad5adfa63876da5bae06ce5f8b2776af12ea19 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Mon, 12 Nov 2018 16:20:30 -0500 Subject: [PATCH] Update template and add migration --- .../4f46aecb337f_add_columns_to_auditevent.py | 30 +++++++++++++++++++ atst/models/audit_event.py | 2 -- templates/audit_log.html | 10 +++++++ 3 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 alembic/versions/4f46aecb337f_add_columns_to_auditevent.py diff --git a/alembic/versions/4f46aecb337f_add_columns_to_auditevent.py b/alembic/versions/4f46aecb337f_add_columns_to_auditevent.py new file mode 100644 index 00000000..03548f42 --- /dev/null +++ b/alembic/versions/4f46aecb337f_add_columns_to_auditevent.py @@ -0,0 +1,30 @@ +"""Add columns to AuditEvent + +Revision ID: 4f46aecb337f +Revises: 4c0b8263d800 +Create Date: 2018-11-12 16:03:55.281648 + +""" +from alembic import op +import sqlalchemy as sa +from sqlalchemy.dialects import postgresql + +# revision identifiers, used by Alembic. +revision = '4f46aecb337f' +down_revision = '4c0b8263d800' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('audit_events', sa.Column('changed_state', postgresql.JSON(astext_type=sa.Text()), nullable=True)) + op.add_column('audit_events', sa.Column('event_details', postgresql.JSON(astext_type=sa.Text()), nullable=True)) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('audit_events', 'event_details') + op.drop_column('audit_events', 'changed_state') + # ### end Alembic commands ### diff --git a/atst/models/audit_event.py b/atst/models/audit_event.py index 0fc0494f..0e60dcdc 100644 --- a/atst/models/audit_event.py +++ b/atst/models/audit_event.py @@ -1,7 +1,6 @@ from sqlalchemy import String, Column, ForeignKey, inspect from sqlalchemy.dialects.postgresql import UUID, JSON from sqlalchemy.orm import relationship -from atst.database import db from atst.models import Base, types from atst.models.mixins.timestamps import TimestampsMixin @@ -29,7 +28,6 @@ class AuditEvent(Base, TimestampsMixin): display_name = Column(String()) action = Column(String(), nullable=False) - def save(self, connection): attrs = inspect(self).dict diff --git a/templates/audit_log.html b/templates/audit_log.html index 8455276f..5e143aa9 100644 --- a/templates/audit_log.html +++ b/templates/audit_log.html @@ -28,6 +28,16 @@
+ {% if event.event_details %} + for User {{ event.event_details.updated_user_id }} ({{ event.event_details.updated_user }}) +
+ {% endif %} + + {% if event.changed_state %} + from {{ event.changed_state.role[0] }} to {{ event.changed_state.role[1] }} +
+ {% endif %} + {% if event.workspace %} in Workspace {{ event.workspace_id }} ({{ event.workspace.name }}) {% elif event.request %}