From 51d1d2ad9ad208fce81d27dc8260d0a75a0bde8d Mon Sep 17 00:00:00 2001 From: Daniel Karbach Date: Tue, 3 Feb 2026 16:04:50 +0100 Subject: [PATCH] tournament permissions cleanup --- app/Policies/RoundPolicy.php | 2 +- app/Policies/TournamentPolicy.php | 4 ++-- resources/js/helpers/permissions.js | 8 +++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/Policies/RoundPolicy.php b/app/Policies/RoundPolicy.php index 3afff4a..cb33e0b 100644 --- a/app/Policies/RoundPolicy.php +++ b/app/Policies/RoundPolicy.php @@ -129,7 +129,7 @@ class RoundPolicy */ public function setSeed(User $user, Round $round) { - return !$round->locked && ($user->isRunner($round->tournament) || $user->isTournamentAdmin($round->tournament)); + return !$round->locked && $user->isTournamentAdmin($round->tournament); } /** diff --git a/app/Policies/TournamentPolicy.php b/app/Policies/TournamentPolicy.php index c43af70..22854d5 100644 --- a/app/Policies/TournamentPolicy.php +++ b/app/Policies/TournamentPolicy.php @@ -101,7 +101,7 @@ class TournamentPolicy */ public function addRound(User $user, Tournament $tournament) { - return !$tournament->locked && ($user->isRunner($tournament) || $user->isTournamentAdmin($tournament)); + return !$tournament->locked && $user->isTournamentAdmin($tournament); } /** @@ -125,7 +125,7 @@ class TournamentPolicy */ public function viewProtocol(User $user, Tournament $tournament) { - return $user->isTournamentCrew($tournament); + return $user->isAdmin() || $user->isTournamentCrew($tournament); } /** diff --git a/resources/js/helpers/permissions.js b/resources/js/helpers/permissions.js index 4f0ce28..2ec88ce 100644 --- a/resources/js/helpers/permissions.js +++ b/resources/js/helpers/permissions.js @@ -153,8 +153,7 @@ export const hasFinished = (user, round) => round.results.find(r => r.user_id == user.id && r.has_finished); export const mayAddRounds = (user, tournament) => - !tournament.locked && - (isRunner(user, tournament) || isTournamentAdmin(user, tournament)); + !tournament.locked && isTournamentAdmin(user, tournament); export const mayApply = (user, tournament) => user && tournament && tournament.accept_applications && @@ -182,8 +181,7 @@ export const mayGetSeed = (user, tournament, round) => round.locked || !tournament.require_auth || !!user; export const maySetSeed = (user, tournament, round) => - !round.locked && - (isRunner(user, tournament) || isTournamentAdmin(user, tournament)); + !round.locked && isTournamentAdmin(user, tournament); export const mayExportTournament = (user, tournament) => isAdmin(user) || isTournamentCrew(user, tournament); @@ -192,7 +190,7 @@ export const mayUpdateTournament = (user, tournament) => isAdmin(user) || isTournamentAdmin(user, tournament); export const mayViewProtocol = (user, tournament) => - isTournamentCrew(user, tournament); + isAdmin(user) || isTournamentCrew(user, tournament); export const maySeeRound = (user, tournament, round) => { if (!Tournament.hasAssignedGroups(tournament)) { -- 2.47.3