idk/muwire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix xml, placeholders for browse links

Browse Source
This commit is contained in:
Zlatin Balevsky
2019-12-08 11:43:21 +00:00
parent 2b1d95e2ef
commit 949b616fdd
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webui/src/main/java/com/muwire/webui/SearchServlet.java
View File

@@ -112,7 +112,7 @@ public class SearchServlet extends HttpServlet {
resultSet.forEach(result -> {
sb.append("<Result>");
sb.append("<Sender>").append(Util.escapeHTMLinXML(result.getSender().getHumanReadableName())).append("</Sender>");
sb.append("<SenderB64").append(result.getSender().toBase64()).append("</SenderB64>");
sb.append("<SenderB64>").append(result.getSender().toBase64()).append("</SenderB64>");
sb.append("<Browse>").append(result.getBrowse()).append("</Browse>");
if (result.getComment() != null) {
sb.append("<Comment>")

14
webui/src/main/js/search.js
View File

@@ -195,7 +195,7 @@ function updateFile(fileInfoHash) {
resultsFromSpan.innerHTML = "Results For "+searchResults.name;
var resultsDiv = document.getElementById("bottomTable");
var table = "<table><thead><tr><th>Sender</th></tr></thead><tbody>";
var table = "<table><thead><tr><th>Sender</th><th>Browse</th></tr></thead><tbody>";
var i;
for (var [senderName, result] of searchResults.results) {
table += "<tr>";
@@ -218,6 +218,7 @@ function updateFile(fileInfoHash) {
}
}
table += "</td>";
table += "<td>" + result.browse + "</td>"
table += "</tr>";
}
table += "</tbody></table>";
@@ -232,12 +233,17 @@ function updateUUIDBySender(resultUUID) {
currentSearchSpan.innerHTML = searches.get(uuid).query + " Results";
var sendersDiv = document.getElementById("topTable");
var table = "<table><thead><tr><th>Sender</th></tr></thead><tbody>";
var table = "<table><thead><tr><th>Sender</th><th>Browse</th></tr></thead><tbody>";
var x = searches.get(uuid).resultBatches;
for (var [senderName, ignored] of x) {
for (var [senderName, senderBatch] of x) {
table += "<tr><td><a href='#' onclick='updateSender(\""+senderName+"\");return false;'>"
table += senderName;
table += "</a></td></tr>";
table += "</a></td>";
if (senderBatch.browse)
table += "<td>true</td>"
else
table += "<td>false</td>"
table += "</tr>";
}
table += "</tbody></table>";
if (x.size > 0)