simon987/sist2
1
0
Fork 0
mirror of https://github.com/simon987/sist2.git synced 2025-12-11 14:38:54 +00:00
Code Issues Projects Releases Wiki Activity

Fix for ES 7.7 #54

Browse Source
This commit is contained in:
simon987
2020-06-01 18:14:06 -04:00
parent 5e7fdaf8dd
commit 13fdbd9e69
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/static/js/search.js
View File

@@ -332,24 +332,24 @@ function search(after = null) {
let path = pathBar.value.replace(/\/$/, "").toLowerCase(); //remove trailing slashes
if (path !== "") {
filters.push([{term: {path: path}}])
filters.push({term: {path: path}})
}
let mimeTypes = getSelectedNodes(mimeTree);
if (!mimeTypes.includes("any")) {
filters.push([{terms: {"mime": mimeTypes}}]);
filters.push({terms: {"mime": mimeTypes}});
}
let tags = getSelectedNodes(tagTree);
if (!tags.includes("any")) {
filters.push([{terms: {"tag": tags}}]);
filters.push({terms: {"tag": tags}});
}
if (date_min && date_max) {
filters.push([{range: {mtime: {gte: date_min, lte: date_max}}}])
filters.push({range: {mtime: {gte: date_min, lte: date_max}}})
} else if (date_min) {
filters.push([{range: {mtime: {gte: date_min}}}])
filters.push({range: {mtime: {gte: date_min}}})
} else if (date_max) {
filters.push([{range: {mtime: {lte: date_max}}}])
filters.push({range: {mtime: {lte: date_max}}})
}
let q = {
@@ -399,6 +399,8 @@ function search(after = null) {
}
}
console.log(q)
$.jsonPost("es", q).then(searchResult => {
let hits = searchResult["hits"]["hits"];
if (hits) {