From 6b05791250f00b3b6eb86e9a7baee62fea646a40 Mon Sep 17 00:00:00 2001 From: Dmitry Atamanov Date: Fri, 3 Apr 2026 23:06:37 +0500 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6?= =?UTF-8?q?=D0=BA=D0=B0=20Markdown=20=D0=B2=20=D0=B2=D0=B0=D1=80=D0=B8?= =?UTF-8?q?=D0=B0=D0=BD=D1=82=D0=B0=D1=85=20=D0=BE=D0=BF=D1=80=D0=BE=D1=81?= =?UTF-8?q?=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/ru/org/linux/poll/PreparedPoll.java | 13 ++++++++++++- src/main/webapp/WEB-INF/jsp/edit.jsp | 4 ++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/java/ru/org/linux/poll/PreparedPoll.java b/src/main/java/ru/org/linux/poll/PreparedPoll.java index 89a332685..75ded139c 100644 --- a/src/main/java/ru/org/linux/poll/PreparedPoll.java +++ b/src/main/java/ru/org/linux/poll/PreparedPoll.java @@ -19,6 +19,11 @@ import com.google.common.collect.ImmutableList; import ru.org.linux.util.StringUtil; +import com.vladsch.flexmark.util.ast.Node; +import com.vladsch.flexmark.html.HtmlRenderer; +import com.vladsch.flexmark.parser.Parser; +import com.vladsch.flexmark.util.data.MutableDataSet; + import java.util.List; /** @@ -110,14 +115,20 @@ public boolean isUserVoted() { * @return html табличку результатов голосования */ public String renderPoll() { + MutableDataSet options = new MutableDataSet(); + Parser parser = Parser.builder(options).build(); + HtmlRenderer renderer = HtmlRenderer.builder(options).build(); + StringBuilder out = new StringBuilder(); out.append(""); int total = 0; for (PollVariantResult var : variants) { // label votes imgTag String formatRow = ""; + Node document = parser.parse(var.getLabel()); + String html = renderer.render(document); int votes = var.getVotes(); - String row = String.format(formatRow, StringUtil.escapeHtml(var.getLabel()), votes); + String row = String.format(formatRow, StringUtil.escapeHtml(html), votes); out.append(row); total += votes; } diff --git a/src/main/webapp/WEB-INF/jsp/edit.jsp b/src/main/webapp/WEB-INF/jsp/edit.jsp index a42c78741..1f213d366 100644 --- a/src/main/webapp/WEB-INF/jsp/edit.jsp +++ b/src/main/webapp/WEB-INF/jsp/edit.jsp @@ -121,11 +121,11 @@ -
+
-
+
%s%d