From 203320289cdc1e87d83ee88c8155ffbbf1b50e56 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Mon, 28 Aug 2023 13:38:39 +0200
Subject: [PATCH] =?UTF-8?q?Jinja:=20Pou=C5=BE=C3=ADv=C3=A1me=20knihovnu=20?=
=?UTF-8?q?points?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mo/web/jinja.py | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/mo/web/jinja.py b/mo/web/jinja.py
index ad4c519d..9d58039c 100644
--- a/mo/web/jinja.py
+++ b/mo/web/jinja.py
@@ -11,7 +11,9 @@ import urllib.parse
import mo.config as config
import mo.db as db
import mo.place_level
+import mo.points
from mo.rights import Right
+from mo.util import assert_not_none
import mo.util_format as util_format
from mo.web import app
from mo.web.org_place import place_breadcrumbs
@@ -139,14 +141,7 @@ def user_flags(u: db.User) -> Markup:
@app.template_filter()
def sol_editable_points(s: Optional[db.Solution]) -> str:
- if s is None:
- return 'X'
- elif s.is_empty:
- return 'P'
- elif s.points is None:
- return ""
- else:
- return util_format.format_decimal(s.points)
+ return mo.points.format_sol_editable_points(s)
@app.template_filter()
@@ -161,4 +156,4 @@ def sol_display_points(s: Optional[db.Solution], user: bool = False) -> Union[st
else:
return Markup('<span class="unknown">?</span>')
else:
- return util_format.format_decimal(s.points)
+ return assert_not_none(util_format.format_decimal(s.points))
--
GitLab