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