Dont have to join competition to see leaderboard

diff --git a/codebox/controllers/leaderboard/update.moon b/codebox/controllers/leaderboard/update.moon
index 1cab4ad46ccfb96a8f86ba13ac8d416a705361f7..59efe8dc174f078a7eda79fcda1a56d7da70590f 100644 (file)
--- a/codebox/controllers/leaderboard/update.moon
+++ b/codebox/controllers/leaderboard/update.moon
@@ -3,7 +3,7 @@ Leaderboard = require 'views.ssr.leaderboard'
 
 make_controller
     layout: false
-    middleware: { 'logged_in', 'joined_competition', 'competition_started' }
+    middleware: { 'logged_in', 'competition_started' }
 
     get: =>
         @placements = @competition\get_leaderboard!

diff --git a/codebox/controllers/leaderboard/view.moon b/codebox/controllers/leaderboard/view.moon
index ae13b893f9b9e2b4bace32b8d18063b82e72f77d..b5f59dbff799dc8b8ebf74b367d1687aebe5c66b 100644 (file)
--- a/codebox/controllers/leaderboard/view.moon
+++ b/codebox/controllers/leaderboard/view.moon
@@ -4,7 +4,7 @@ import capture_errors, capture_errors_json, yield_error from require 'lapis.appl
 import LeaderboardProblems, LeaderboardPlacements from require 'models'
 
 make_controller
-    middleware: { 'logged_in', 'joined_competition', 'competition_started' }
+    middleware: { 'logged_in', 'competition_started' }
        scripts: { 'leaderboard_update' }
        raw_scripts: { '/socket.io/socket.io.js' }
 

diff --git a/codebox/middleware/competition_started.moon b/codebox/middleware/competition_started.moon
index c816c21b5b81d24398ff451b1874c4e6d426cad0..ec0bb4b7c4100671e24ef26c8a97749d72674a27 100644 (file)
--- a/codebox/middleware/competition_started.moon
+++ b/codebox/middleware/competition_started.moon
@@ -2,7 +2,10 @@ import Competitions from require 'models'
 
 =>
     unless @competition
-        @write json: 'No active competition'
+               @competition = Competitions\find active: true
+
+               unless @competition
+                       @write json: 'No active competition'
 
     current_time = os.time()
     start_time = @competition\get_start_time_num!

diff --git a/codebox/middleware/during_competition.moon b/codebox/middleware/during_competition.moon
index 1814f33c814d00bba604ba2bf114d866245da41a..39afe6191fe10d616157ff4e443b4d8736d05751 100644 (file)
--- a/codebox/middleware/during_competition.moon
+++ b/codebox/middleware/during_competition.moon
@@ -2,7 +2,10 @@ import Competitions from require 'models'
 
 =>
     unless @competition
-        @write json: 'No active competition'
+               @competition = Competitions\find active: true
+
+               unless @competition
+                       @write json: 'No active competition'
 
     current_time = os.time()
     start_time = @competition\get_start_time_num!