Skip to content

Fix updates when no contest is set #2621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 28, 2024
Merged

Fix updates when no contest is set #2621

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a716abf
Fix indentation/alignment
vmcj Jul 24, 2024
a094543
Don't display number of balloons when no contest is active
vmcj Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions webapp/src/Service/DOMJudgeService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,18 +419,18 @@ public function getUpdates(): array
}
}

if ($this->checkrole('balloon')) {
if ($this->checkrole('balloon') && $contest) {
$balloonsQuery = $this->em->createQueryBuilder()
->select('b.balloonid', 't.name', 't.location', 'p.name AS pname')
->from(Balloon::class, 'b')
->leftJoin('b.submission', 's')
->leftJoin('s.problem', 'p')
->leftJoin('s.contest', 'co')
->leftJoin('p.contest_problems', 'cp', Join::WITH, 'co.cid = cp.contest AND p.probid = cp.problem')
->leftJoin('s.team', 't')
->andWhere('co.cid = :cid')
->andWhere('b.done = 0')
->setParameter('cid', $contest->getCid());
->select('b.balloonid', 't.name', 't.location', 'p.name AS pname')
->from(Balloon::class, 'b')
->leftJoin('b.submission', 's')
->leftJoin('s.problem', 'p')
->leftJoin('s.contest', 'co')
->leftJoin('p.contest_problems', 'cp', Join::WITH, 'co.cid = cp.contest AND p.probid = cp.problem')
->leftJoin('s.team', 't')
->andWhere('co.cid = :cid')
->andWhere('b.done = 0')
->setParameter('cid', $contest->getCid());

$freezetime = $contest->getFreezeTime();
if ($freezetime !== null && !(bool)$this->config->get('show_balloons_postfreeze')) {
Expand Down
Loading