diff --git a/CTFd/config.py b/CTFd/config.py index 175f8a69..11b90439 100644 --- a/CTFd/config.py +++ b/CTFd/config.py @@ -1,7 +1,6 @@ import os ##### SERVER SETTINGS ##### SECRET_KEY = os.urandom(64) -#SQLALCHEMY_DATABASE_URI = 'mysql+pymysql://root:password@localhost/ctfd' SQLALCHEMY_DATABASE_URI = 'sqlite:///ctfd.db' SESSION_TYPE = "filesystem" SESSION_FILE_DIR = "/tmp/flask_session" diff --git a/CTFd/scoreboard.py b/CTFd/scoreboard.py index 5246805b..c46ac7f7 100644 --- a/CTFd/scoreboard.py +++ b/CTFd/scoreboard.py @@ -20,9 +20,9 @@ def scores(): quickest = db.func.max(Solves.date).label('quickest') teams = db.session.query(Solves.teamid, Teams.name, score).join(Teams).join(Challenges).filter(Teams.banned == None).group_by(Solves.teamid).order_by(score.desc(), quickest) db.session.close() - json = {'teams':[]} + json = {'standings':[]} for i, x in enumerate(teams): - json['teams'].append({'place':i+1, 'id':x.teamid, 'name':x.name,'score':int(x.score)}) + json['standings'].append({'pos':i+1, 'id':x.teamid, 'name':x.name,'score':int(x.score)}) return jsonify(json) diff --git a/CTFd/static/js/scoreboard.js b/CTFd/static/js/scoreboard.js index 8d9f9cfa..db7246d5 100644 --- a/CTFd/static/js/scoreboard.js +++ b/CTFd/static/js/scoreboard.js @@ -27,8 +27,8 @@ function updatescores () { $.get('/scores', function( data ) { teams = $.parseJSON(JSON.stringify(data)); $('#scoreboard > tbody').empty() - for (var i = 0; i < teams['teams'].length; i++) { - row = "