diff --git a/app/models/access_log.py b/app/models/access_log.py index f070ee4..4229c82 100644 --- a/app/models/access_log.py +++ b/app/models/access_log.py @@ -61,7 +61,7 @@ def get_full_log(cls, start_time=None, end_time=None, limit=100, offset=0): cursor = connection.cursor() query = """ - SELECT u.name, u.key, d.name, d.id, operation_type, operation_time + SELECT u.name, u.key, d.name AS device_name, d.id, operation_type, operation_time FROM event_logs LEFT JOIN users u ON event_logs.user_key = u.key LEFT JOIN devices d ON d.id = event_logs.device_id diff --git a/app/templates/auth/init_app.html b/app/templates/auth/init_app.html index f12f60f..385e67d 100644 --- a/app/templates/auth/init_app.html +++ b/app/templates/auth/init_app.html @@ -17,9 +17,6 @@