From 3a8a7e5dd089ec24f8ebb5b46b3a332b56abab52 Mon Sep 17 00:00:00 2001 From: Kevin Chung Date: Wed, 13 Sep 2017 02:18:00 -0400 Subject: [PATCH] Fixing challenge ordering bug introduced (#385) --- CTFd/themes/original/static/js/chalboard.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/CTFd/themes/original/static/js/chalboard.js b/CTFd/themes/original/static/js/chalboard.js index 1a1e6f9e..3a76db88 100644 --- a/CTFd/themes/original/static/js/chalboard.js +++ b/CTFd/themes/original/static/js/chalboard.js @@ -168,13 +168,15 @@ function updatesolves(cb){ var chalids = Object.keys(solves); for (var i = 0; i < chalids.length; i++) { - for (var i = 0; i < challenges['game'].length; i++) { - var obj = challenges['game'][i]; + for (var z = 0; z < challenges['game'].length; z++) { + var obj = challenges['game'][z]; var solve_cnt = solves[chalids[i]]; - if (solve_cnt) { - obj.solves = solve_cnt; - } else { - obj.solves = 0; + if (obj.id == chalids[i]){ + if (solve_cnt) { + obj.solves = solve_cnt; + } else { + obj.solves = 0; + } } } }; @@ -203,10 +205,6 @@ function loadchals(cb) { var categories = []; challenges = $.parseJSON(JSON.stringify(data)); - challenges['game'].sort(function(a, b) { - return a.id - b.id || a.name.localeCompare(b.name); - }); - $('#challenges-board').html(""); for (var i = challenges['game'].length - 1; i >= 0; i--) {