Common
This commit is contained in:
		@ -107,7 +107,7 @@ class WhaleContainer(db.Model):
 | 
				
			|||||||
class WhaleContainerLog(db.Model):
 | 
					class WhaleContainerLog(db.Model):
 | 
				
			||||||
    id = db.Column(db.Integer,primary_key=True, autoincrement=True)
 | 
					    id = db.Column(db.Integer,primary_key=True, autoincrement=True)
 | 
				
			||||||
    challenge_id = db.Column(None, db.ForeignKey("challenges.id"))
 | 
					    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)
 | 
					    start_time = db.Column(db.DateTime, nullable=False, default=datetime.utcnow)
 | 
				
			||||||
    uuid = db.Column(db.String(256))
 | 
					    uuid = db.Column(db.String(256))
 | 
				
			||||||
    port = db.Column(db.Integer, nullable=True, default=0)
 | 
					    port = db.Column(db.Integer, nullable=True, default=0)
 | 
				
			||||||
 | 
				
			|||||||
@ -22,16 +22,20 @@
 | 
				
			|||||||
                <tr>
 | 
					                <tr>
 | 
				
			||||||
                    <td class="border-right" data-checkbox>
 | 
					                    <td class="border-right" data-checkbox>
 | 
				
			||||||
                        <div class="form-check text-center"> 
 | 
					                        <div class="form-check text-center"> 
 | 
				
			||||||
                            <input type="checkbox" class="form-check-input" data-user-id="{{ container.user.id }}">
 | 
					                            <input type="checkbox" class="form-check-input" data-user-id="{{ container.user.id if container.user else '' }}">
 | 
				
			||||||
                        </div>
 | 
					                        </div>
 | 
				
			||||||
                    </td>
 | 
					                    </td>
 | 
				
			||||||
                    <td class="text-center">
 | 
					                    <td class="text-center">
 | 
				
			||||||
                        {{ container.id }}
 | 
					                        {{ container.id }}
 | 
				
			||||||
                    </td>
 | 
					                    </td>
 | 
				
			||||||
                    <td class="text-center">
 | 
					                    <td class="text-center">
 | 
				
			||||||
 | 
					                        {% if container.user %}
 | 
				
			||||||
                            <a href="{{ url_for('admin.users_detail', user_id=container.user.id) }}">
 | 
					                            <a href="{{ url_for('admin.users_detail', user_id=container.user.id) }}">
 | 
				
			||||||
                                {{ container.user.name | truncate(12) }}
 | 
					                                {{ container.user.name | truncate(12) }}
 | 
				
			||||||
                            </a>
 | 
					                            </a>
 | 
				
			||||||
 | 
					                        {% else %}
 | 
				
			||||||
 | 
					                            <span class="text-muted">无关联用户</span>
 | 
				
			||||||
 | 
					                        {% endif %}
 | 
				
			||||||
                    </td>
 | 
					                    </td>
 | 
				
			||||||
                    <td class="text-center">
 | 
					                    <td class="text-center">
 | 
				
			||||||
                        <a href="{{ url_for('admin.challenges_detail', challenge_id=container.challenge.id) }}">
 | 
					                        <a href="{{ url_for('admin.challenges_detail', challenge_id=container.challenge.id) }}">
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user