simple result hiding on initial tournament request

[alttp.git] / resources / js / helpers / permissions.js

diff --git a/resources/js/helpers/permissions.js b/resources/js/helpers/permissions.js
index 566c2d85f04602913192aad67e7c6670d80648ea..2ff823a955143dc166d4169b263a1d87890b5a61 100644 (file)
--- a/resources/js/helpers/permissions.js
+++ b/resources/js/helpers/permissions.js
@@ -36,24 +36,25 @@ export const hasFinished = (user, round) =>
        round.results.find(r => r.user_id == user.id && r.has_finished);
 
 export const mayAddRounds = (user, tournament) =>
-       isAdmin(user) || (!tournament.locked &&
-               (isRunner(user, tournament) || isTournamentAdmin(user, tournament)));
+       !tournament.locked &&
+               (isAdmin(user) || isRunner(user, tournament) || isTournamentAdmin(user, tournament));
 
 export const mayLockRound = (user, tournament) =>
-       isAdmin(user) || (!tournament.locked && isTournamentAdmin(user, tournament));
+       !tournament.locked && (isAdmin(user) || isTournamentAdmin(user, tournament));
 
 export const maySetSeed = (user, tournament, round) =>
-       isAdmin(user) || (!round.locked &&
-               (isRunner(user, tournament) || isTournamentAdmin(user, tournament)));
+       !round.locked &&
+               (isAdmin(user) || isRunner(user, tournament) || isTournamentAdmin(user, tournament));
 
 export const mayViewProtocol = (user, tournament) =>
        isAdmin(user) || isTournamentCrew(user, tournament);
 
 export const maySeeResults = (user, tournament, round) =>
+       round.locked ||
        hasFinished(user, round) ||
-               isTournamentMonitor(user, tournament) ||
-               (isTournamentAdmin(user, tournament) && !isRunner(user, tournament)) ||
-               Round.isComplete(tournament, round);
+       isTournamentMonitor(user, tournament) ||
+       (isTournamentAdmin(user, tournament) && !isRunner(user, tournament)) ||
+       Round.isComplete(tournament, round);
 
 // Users