remove absurd admin permissions

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

diff --git a/resources/js/helpers/permissions.js b/resources/js/helpers/permissions.js
index f86b5851c94c4553486b3f2b741678de9c345197..8b8c596100270d6c32c4e2b2ff08d2220e96ba08 100644 (file)
--- a/resources/js/helpers/permissions.js
+++ b/resources/js/helpers/permissions.js
@@ -36,27 +36,30 @@ 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 &&
+               (isRunner(user, tournament) || isTournamentAdmin(user, tournament));
 
 export const mayLockRound = (user, tournament) =>
-       isAdmin(user) || (!tournament.locked && isTournamentAdmin(user, tournament));
+       !tournament.locked && isTournamentAdmin(user, tournament);
 
 export const maySetSeed = (user, tournament, round) =>
-       isAdmin(user) || (!round.locked &&
-               (isRunner(user, tournament) || isTournamentAdmin(user, tournament)));
+       !round.locked &&
+               (isRunner(user, tournament) || isTournamentAdmin(user, tournament));
 
 export const mayViewProtocol = (user, tournament) =>
-       isAdmin(user) || isTournamentCrew(user, tournament);
+       isTournamentCrew(user, tournament);
 
 export const maySeeResults = (user, tournament, round) =>
-       isAdmin(user) || hasFinished(user, round) ||
-               isTournamentMonitor(user, tournament) || Round.isComplete(tournament, round);
+       round.locked ||
+       hasFinished(user, round) ||
+       isTournamentMonitor(user, tournament) ||
+       (isTournamentAdmin(user, tournament) && !isRunner(user, tournament)) ||
+       Round.isComplete(tournament, round);
 
 // Users
 
 export const mayEditNickname = (user, subject) =>
-       isAdmin(user) || isSameUser(user, subject);
+       isSameUser(user, subject);
 
 export const mayEditStreamLink = (user, subject) =>
-       isAdmin(user) || isSameUser(user, subject);
+       isSameUser(user, subject);