goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clear bottom table if there are no results, GitLab issue #52

pull/53/head
Zlatin Balevsky 2020-11-22 22:42:54 +00:00
parent cea82aa0b4
commit 0e1fe12722
No known key found for this signature in database
GPG Key ID: A72832072D525E41
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,7 +149,7 @@ public class SearchServlet extends HttpServlet {
} }
SearchResults searchResults = searchManager.getResults().get(uuid); SearchResults searchResults = searchManager.getResults().get(uuid);
Set<UIResultEvent> results = searchResults.getBySender().get(sender); Set<UIResultEvent> results = searchResults.getBySender().getOrDefault(sender, Collections.emptySet());
List<ResultFromSender> resultsFromSender = new ArrayList<>(); List<ResultFromSender> resultsFromSender = new ArrayList<>();
results.forEach(result -> { results.forEach(result -> {
ResultStatus resultStatus = ResultStatus.AVAILABLE; ResultStatus resultStatus = ResultStatus.AVAILABLE;
@ -234,7 +234,7 @@ public class SearchServlet extends HttpServlet {
Set<UIResultEvent> resultSet = searchResults.getByInfoHash(infoHash); Set<UIResultEvent> resultSet = searchResults.getByInfoHash(infoHash);
if (resultSet == null) if (resultSet == null)
return; resultSet = Collections.emptySet();
List<SenderForResult> sendersForResult = new ArrayList<>(); List<SenderForResult> sendersForResult = new ArrayList<>();
resultSet.forEach(event -> { resultSet.forEach(event -> {

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

@ -787,6 +787,8 @@ function refreshSender(searchUUID) {
var topTableDiv = document.getElementById("topTableSender") var topTableDiv = document.getElementById("topTableSender")
topTableDiv.innerHTML = tableHtml topTableDiv.innerHTML = tableHtml
var bottomTableDiv = document.getElementById("bottomTableSender")
bottomTableDiv.innerText = ""
if (currentSender != null) if (currentSender != null)
refreshResultsFromSender(currentSender) refreshResultsFromSender(currentSender)
} }
@ -809,6 +811,8 @@ function refreshFile(searchUUID) {
var topTableDiv = document.getElementById("topTableFile") var topTableDiv = document.getElementById("topTableFile")
topTableDiv.innerHTML = tableHtml topTableDiv.innerHTML = tableHtml
var bottomTableDiv = document.getElementById("bottomTableFile")
bottomTableDiv.innerText = ""
if (currentResult != null) if (currentResult != null)
refreshSendersForResult(currentResult) refreshSendersForResult(currentResult)
} }