Fixed publicserver search
This commit is contained in:
parent
8c0951a0ea
commit
b55bd54b29
25
js/main.js
25
js/main.js
|
@ -1072,7 +1072,7 @@ PublicServers.prototype.loadServers = function(dataset, search, clear) {
|
|||
PublicServers.prototype.search = function(start, clear) {
|
||||
var sterm = $("#pubs-sterm").val();
|
||||
|
||||
var dataset = {
|
||||
/*var dataset = {
|
||||
"sort": [{ "online": "desc" }],
|
||||
"from": start,
|
||||
"size": 20,
|
||||
|
@ -1095,9 +1095,30 @@ PublicServers.prototype.search = function(start, clear) {
|
|||
}
|
||||
}
|
||||
}
|
||||
};*/
|
||||
|
||||
var dataset = {
|
||||
"sort": [{ "online": "desc" }],
|
||||
"from": start,
|
||||
"size": 20,
|
||||
"query": {
|
||||
"bool": {
|
||||
"must": [
|
||||
{"query_string": {
|
||||
"default_operator": "AND",
|
||||
"query": sterm ? sterm : "*"
|
||||
}}
|
||||
],
|
||||
"must_not": [
|
||||
{"match": { "identifier": this.filtered }}
|
||||
]
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
if(this.selectedCategory != "all") {
|
||||
dataset.query.filtered.filter.bool.must = [{ "term": { "categories.id": this.selectedCategory } }]
|
||||
dataset.query.bool.must.push({ "match_phrase": { "categories": this.selectedCategory } });
|
||||
}
|
||||
|
||||
this.loadServers(dataset, true, clear);
|
||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue