remove nonsensical admin permissions

diff --git a/app/Policies/RoundPolicy.php b/app/Policies/RoundPolicy.php
index c1a1a4845beb157e0ddcc50547ced4d28b440531..c02d374450facecd0ab239da1aef5430b5238953 100644 (file)
--- a/app/Policies/RoundPolicy.php
+++ b/app/Policies/RoundPolicy.php
@@ -101,7 +101,7 @@ class RoundPolicy
         */
        public function setSeed(User $user, Round $round)
        {
-               return $user->isAdmin() || (!$round->locked && ($user->isRunner($round->tournament) || $user->isTournamentAdmin($round->tournament)));
+               return !$round->locked && ($user->isAdmin() || $user->isRunner($round->tournament) || $user->isTournamentAdmin($round->tournament));
        }
 
        /**
@@ -113,7 +113,7 @@ class RoundPolicy
         */
        public function lock(User $user, Round $round)
        {
-               return $user->isAdmin() || $user->isTournamentAdmin($round->tournament);
+               return !$round->tournament->locked && ($user->isAdmin() || $user->isTournamentAdmin($round->tournament));
        }
 
        /**

diff --git a/app/Policies/TournamentPolicy.php b/app/Policies/TournamentPolicy.php
index 72b5dcba3131dfe9ae53c4f4c463fef6f34ec7da..66ab1f6b0fffba669aa205c367d87376a6026ba6 100644 (file)
--- a/app/Policies/TournamentPolicy.php
+++ b/app/Policies/TournamentPolicy.php
@@ -101,7 +101,7 @@ class TournamentPolicy
         */
        public function addRound(User $user, Tournament $tournament)
        {
-               return $user->isAdmin() || (!$tournament->locked && ($user->isRunner($tournament) || $user->isTournamentAdmin($tournament)));
+               return !$tournament->locked && ($user->isAdmin() || $user->isRunner($tournament) || $user->isTournamentAdmin($tournament));
        }
 
        /**

diff --git a/resources/js/helpers/permissions.js b/resources/js/helpers/permissions.js
index 566c2d85f04602913192aad67e7c6670d80648ea..b33f1c3b9889c4e8ba45702f9d1610b2921a1ad7 100644 (file)
--- a/resources/js/helpers/permissions.js
+++ b/resources/js/helpers/permissions.js
@@ -36,15 +36,15 @@ 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);