ui: fix scoreboard

This commit is contained in:
undefined committed 2022-05-30 19:23:28 +08:00
1 parent 9477692abb
commit 84569a79b9
3 files changed
+10 -10

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "@hydrooj/ui-default", "name": "@hydrooj/ui-default",
"version": "4.37.15", "version": "4.37.16",
"author": "undefined <i@undefined.moe>", "author": "undefined <i@undefined.moe>",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"main": "hydro.js", "main": "hydro.js",
@@ -35,7 +35,7 @@
{{ column.value }}<br />{{ pdict[column.raw].nAccept }}/{{ pdict[column.raw].nSubmit }} {{ column.value }}<br />{{ pdict[column.raw].nAccept }}/{{ pdict[column.raw].nSubmit }}
</a> </a>
{% else %} {% else %}
{{ column.value|nl2br|safe }} {{ column.value|string|nl2br|safe }}
{% endif %} {% endif %}
</th> </th>
{%- endfor -%} {%- endfor -%}
@@ -52,21 +52,21 @@
{{ user.render_inline(udict[column.raw], badge=false) }} {{ user.render_inline(udict[column.raw], badge=false) }}
{% elif column.type == 'record' and column.raw %} {% elif column.type == 'record' and column.raw %}
<a href="{{ url('record_detail', rid=column.raw) if canView else '' }}" data-tooltip="{{ column.hover }}"> <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> </a>
{% elif column.type == 'records' %} {% elif column.type == 'records' %}
{%- for record in column.raw -%} {%- for record in column.raw -%}
{% if loop.index0 %}/{% endif %} {% if loop.index0 %}/{% endif %}
{% if record.raw %} {% if record.raw %}
<a href="{{ url('record_detail', rid=record.raw) if canView else '' }}"> <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> </a>
{% else %} {% else %}
{{ record.value|nl2br|safe }} {{ record.value|string|nl2br|safe }}
{% endif %} {% endif %}
{%- endfor -%} {%- endfor -%}
{% else %} {% else %}
{{ column.value|nl2br|safe }} {{ column.value|string|nl2br|safe }}
{% endif %} {% endif %}
</td> </td>
{%- endfor -%} {%- endfor -%}
@@ -47,21 +47,21 @@ Exported from <a href="{{ model.system.get('server.url') }}">{{ model.system.get
<td> <td>
{% if column.type == 'record' and column.raw %} {% if column.type == 'record' and column.raw %}
<a href="{{ model.system.get('server.url') }}{{ url('record_detail', rid=column.raw).substr(1,9999) }}"> <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> </a>
{% elif column.type == 'records' %} {% elif column.type == 'records' %}
{%- for record in column.raw -%} {%- for record in column.raw -%}
{% if loop.index0 %}/{% endif %} {% if loop.index0 %}/{% endif %}
{% if record.raw %} {% if record.raw %}
<a href="{{ model.system.get('server.url') }}{{ url('record_detail', rid=record.raw).substr(1,9999) }}"> <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> </a>
{% else %} {% else %}
{{ record.value|nl2br|safe }} {{ record.value|string|nl2br|safe }}
{% endif %} {% endif %}
{%- endfor -%} {%- endfor -%}
{% else %} {% else %}
{{ column.value|nl2br|safe }} {{ column.value|string|nl2br|safe }}
{% endif %} {% endif %}
</td> </td>
{%- endfor -%} {%- endfor -%}