diff --git a/models.py b/models.py index 0a03dc3..8ae2e73 100644 --- a/models.py +++ b/models.py @@ -107,7 +107,7 @@ class WhaleContainer(db.Model): class WhaleContainerLog(db.Model): id = db.Column(db.Integer,primary_key=True, autoincrement=True) challenge_id = db.Column(None, db.ForeignKey("challenges.id")) - user_id = db.Column(None, db.ForeignKey("users.id")) + user_id = db.Column(db.Integer, db.ForeignKey("users.id")) start_time = db.Column(db.DateTime, nullable=False, default=datetime.utcnow) uuid = db.Column(db.String(256)) port = db.Column(db.Integer, nullable=True, default=0) diff --git a/templates/containers/list.logs.html b/templates/containers/list.logs.html index e92e513..0dfa185 100644 --- a/templates/containers/list.logs.html +++ b/templates/containers/list.logs.html @@ -22,16 +22,20 @@
  - +
{{ container.id }} - - {{ container.user.name | truncate(12) }} - + {% if container.user %} + + {{ container.user.name | truncate(12) }} + + {% else %} + 无关联用户 + {% endif %}