Skip to content

Commit e913d7c

Browse files
committed
Clean up mentions of external ID on submission page.
(cherry picked from commit c013ceb)
1 parent 5650592 commit e913d7c

File tree

1 file changed

+19
-30
lines changed

1 file changed

+19
-30
lines changed

webapp/templates/jury/submission.html.twig

Lines changed: 19 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -197,15 +197,20 @@
197197
</a>
198198
</span>
199199
200-
{% if external_ccs_submission_url is not empty %}
201-
{% set externalSubmissionUrl = submission | externalCcsUrl %}
202-
{% if externalSubmissionUrl is not empty %}
203-
<span>
204-
<i class="fas fa-link" title="External link:"></i>
205-
<a href="{{ externalSubmissionUrl }}" target="_blank">
206-
View in external CCS
207-
</a>
208-
</span>
200+
{% if shadowMode() and submission.externalid %}
201+
{% if external_ccs_submission_url is empty %}
202+
External ID: {{- submission.externalid -}}
203+
{% else %}
204+
{% set externalSubmissionUrl = submission | externalCcsUrl %}
205+
{% if externalSubmissionUrl is not empty %}
206+
<span>
207+
<i class="fas fa-link" title="External link:"></i>
208+
<a href="{{ externalSubmissionUrl }}" target="_blank">
209+
View in external CCS
210+
</a>
211+
(ID: {{- submission.externalid -}})
212+
</span>
213+
{% endif %}
209214
{% endif %}
210215
{% endif %}
211216
</div>
@@ -230,22 +235,6 @@
230235
</div>
231236
{% endif %}
232237
233-
{% if shadowMode() and submission.externalid %}
234-
<div class="mb-2">
235-
External ID:
236-
{% if external_ccs_submission_url is empty %}
237-
{{- submission.externalid -}}
238-
{% else %}
239-
<a href="{{ submission | externalCcsUrl }}" target="_blank">
240-
{{- submission.externalid -}}
241-
</a>
242-
{%- endif -%}
243-
{%- if externalJudgement is not null -%}
244-
, {{ externalJudgement.result | printValidJuryResult }}
245-
{% endif %}
246-
</div>
247-
{% endif %}
248-
249238
{% if externalJudgement is not null and externalJudgement.result is not empty and (
250239
(selectedJudging is not null and selectedJudging.result is not empty and externalJudgement.result != selectedJudging.result)
251240
or submission.importError) %}
@@ -558,11 +547,11 @@
558547
</td>
559548
<td>
560549
{% if externalSubmissionUrl is defined and externalSubmissionUrl is not empty %}
561-
<a href="{{ externalSubmissionUrl }}">
562-
{% endif %}
563-
external {{ externalJudgement.extjudgementid }}
564-
{% if externalSubmissionUrl is defined and externalSubmissionUrl is not empty %}
565-
</a>
550+
<a href="{{ externalSubmissionUrl }}">
551+
{% endif %}
552+
external
553+
{% if externalSubmissionUrl is defined and externalSubmissionUrl is not empty %}
554+
</a>
566555
{% endif %}
567556
</td>
568557
</tr>

0 commit comments

Comments
 (0)