Skip to content

поддержка Markdown в вариантах опросов #1125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
data-man wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

поддержка Markdown в вариантах опросов #1125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/main/java/ru/org/linux/poll/PreparedPoll.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -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("<table>");
int total = 0;
for (PollVariantResult var : variants) {
// label votes imgTag
String formatRow = "<tr><td>%s</td><td>%d</td></tr>";
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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/jsp/edit.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,11 @@

<c:if test="${group.pollPostAllowed}">
<c:forEach var="v" items="${form.poll}" varStatus="i">
<label>Вариант #${i.index}: <form:input path="poll[${v.key}]" size="40"/></label><br>
<label>Вариант #${i.index}: <form:input path="poll[${v.key}]" size="80"/></label><br>
</c:forEach>

<c:forEach var="v" items="${form.newPoll}" varStatus="i">
<label>Новый #${i.index}: <form:input path="newPoll[${i.index}]" size="40"/></label><br>
<label>Новый #${i.index}: <form:input path="newPoll[${i.index}]" size="80"/></label><br>
</c:forEach>

<label>Мультивыбор: <form:checkbox path="multiselect" size="40"/></label>
Expand Down