From 84569a79b991e5344563b1cf0f83ca2f7302abc7 Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Mon, 30 May 2022 19:23:28 +0800
Subject: [PATCH] ui: fix scoreboard

---
 packages/ui-default/package.json                       |  2 +-
 packages/ui-default/templates/contest_scoreboard.html  | 10 +++++-----
 .../templates/contest_scoreboard_download_html.html    |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json
index 04200b301..efd1ccc74 100644
--- a/packages/ui-default/package.json
+++ b/packages/ui-default/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/ui-default",
-  "version": "4.37.15",
+  "version": "4.37.16",
   "author": "undefined <i@undefined.moe>",
   "license": "AGPL-3.0",
   "main": "hydro.js",
diff --git a/packages/ui-default/templates/contest_scoreboard.html b/packages/ui-default/templates/contest_scoreboard.html
index 224de2cca..f324b9624 100644
--- a/packages/ui-default/templates/contest_scoreboard.html
+++ b/packages/ui-default/templates/contest_scoreboard.html
@@ -35,7 +35,7 @@
                 {{ column.value }}<br />{{ pdict[column.raw].nAccept }}/{{ pdict[column.raw].nSubmit }}
               </a>
             {% else %}
-              {{ column.value|nl2br|safe }}
+              {{ column.value|string|nl2br|safe }}
             {% endif %}
             </th>
           {%- endfor -%}
@@ -52,21 +52,21 @@
                 {{ user.render_inline(udict[column.raw], badge=false) }}
               {% elif column.type == 'record' and column.raw %}
                 <a href="{{ url('record_detail', rid=column.raw) if canView else '' }}" data-tooltip="{{ column.hover }}">
-                  <span style="font-weight:bold;color:{{ utils.status.getScoreColor(column.score|default(column.value)) }}">{{ column.value|nl2br|safe }}</span>
+                  <span style="font-weight:bold;color:{{ utils.status.getScoreColor(column.score|default(column.value)) }}">{{ column.value|string|nl2br|safe }}</span>
                 </a>
               {% elif column.type == 'records' %}
                 {%- for record in column.raw -%}
                   {% if loop.index0 %}/{% endif %}
                   {% if record.raw %}
                     <a href="{{ url('record_detail', rid=record.raw) if canView else '' }}">
-                      <span style="font-weight:bold;color:{{ utils.status.getScoreColor(record.score|default(record.value)) }}">{{ record.value|nl2br|safe }}</span>
+                      <span style="font-weight:bold;color:{{ utils.status.getScoreColor(record.score|default(record.value)) }}">{{ record.value|string|nl2br|safe }}</span>
                     </a>
                   {% else %}
-                    {{ record.value|nl2br|safe }}
+                    {{ record.value|string|nl2br|safe }}
                   {% endif %}
                 {%- endfor -%}
               {% else %}
-                {{ column.value|nl2br|safe }}
+                {{ column.value|string|nl2br|safe }}
               {% endif %}
               </td>
             {%- endfor -%}
diff --git a/packages/ui-default/templates/contest_scoreboard_download_html.html b/packages/ui-default/templates/contest_scoreboard_download_html.html
index 7b8623fa1..0c0be5696 100644
--- a/packages/ui-default/templates/contest_scoreboard_download_html.html
+++ b/packages/ui-default/templates/contest_scoreboard_download_html.html
@@ -47,21 +47,21 @@ Exported from <a href="{{ model.system.get('server.url') }}">{{ model.system.get
         <td>
           {% if column.type == 'record' and column.raw %}
             <a href="{{ model.system.get('server.url') }}{{ url('record_detail', rid=column.raw).substr(1,9999) }}">
-              <span style="font-weight:bold;color:{{ utils.status.getScoreColor(column.score|default(column.value)) }}">{{ column.value|nl2br|safe }}</span>
+              <span style="font-weight:bold;color:{{ utils.status.getScoreColor(column.score|default(column.value)) }}">{{ column.value|string|nl2br|safe }}</span>
             </a>
           {% elif column.type == 'records' %}
             {%- for record in column.raw -%}
               {% if loop.index0 %}/{% endif %}
               {% if record.raw %}
                 <a href="{{ model.system.get('server.url') }}{{ url('record_detail', rid=record.raw).substr(1,9999) }}">
-                  <span style="font-weight:bold;color:{{ utils.status.getScoreColor(record.score|default(record.value)) }}">{{ record.value|nl2br|safe }}</span>
+                  <span style="font-weight:bold;color:{{ utils.status.getScoreColor(record.score|default(record.value)) }}">{{ record.value|string|nl2br|safe }}</span>
                 </a>
               {% else %}
-                {{ record.value|nl2br|safe }}
+                {{ record.value|string|nl2br|safe }}
               {% endif %}
             {%- endfor -%}
           {% else %}
-            {{ column.value|nl2br|safe }}
+            {{ column.value|string|nl2br|safe }}
           {% endif %}
         </td>
       {%- endfor -%}