Only show edit/resubmit button if you are allowed to edit.

DOMjudge · Oct 6, 2024 · 5a6b3b5 · 5a6b3b5
1 parent b3db6ab
commit 5a6b3b5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/webapp/src/Controller/Jury/SubmissionController.php b/webapp/src/Controller/Jury/SubmissionController.php
@@ -748,6 +748,10 @@ public function teamOutputAction(Submission $submission, Contest $contest, Judgi
         return Utils::streamAsBinaryFile($outputRun, $filename);
     }
 
+    private function allowEdit(): bool {
+        return $this->dj->getUser()->getTeam() && $this->dj->checkrole('team');
+    }
+
     /**
      * @throws NonUniqueResultException
      */
@@ -865,13 +869,14 @@ public function sourceAction(
             'originalSubmission' => $originalSubmission,
             'originalFiles' => $originalFiles,
             'originalFileStats' => $originalFileStats,
+            'allowEdit' => $this->allowEdit(),
         ]);
     }
 
     #[Route(path: '/{submission}/edit-source', name: 'jury_submission_edit_source')]
     public function editSourceAction(Request $request, Submission $submission, #[MapQueryParameter] ?int $rank = null): Response
     {
-        if (!$this->dj->getUser()->getTeam() || !$this->dj->checkrole('team')) {
+        if (!$this->allowEdit()) {
             $this->addFlash('danger', 'You cannot re-submit code without being a team.');
             return $this->redirectToLocalReferrer($this->router, $request, $this->generateUrl(
                 'jury_submission',

diff --git a/webapp/templates/jury/submission_source.html.twig b/webapp/templates/jury/submission_source.html.twig
@@ -62,10 +62,12 @@
                        href="{{ path('jury_submission_source', {submission: submission.submitid, fetch: file.rank}) }}">
                         <i class="fas fa-download"></i> Download
                     </a>
-                    <a class="btn btn-secondary btn-sm"
-                       href="{{ path('jury_submission_edit_source', {submission: submission.submitid, rank: file.rank}) }}">
-                        <i class="fas fa-pencil-alt"></i> Edit
-                    </a>
+                    {% if allowEdit %}
+                        <a class="btn btn-secondary btn-sm"
+                           href="{{ path('jury_submission_edit_source', {submission: submission.submitid, rank: file.rank}) }}">
+                            <i class="fas fa-pencil-alt"></i> Edit
+                        </a>
+                    {% endif %}
                 </div>
 
                 {{ file.sourcecode | codeEditor(file.rank, submission.language.aceLanguage) }}