Browse Source

78577 if condition changed

Mao 4 years ago
parent
commit
8812c56cbd

+ 1 - 1
packages/app/src/server/routes/search.js

@@ -150,7 +150,7 @@ module.exports = function(crowi, app) {
 
       const ids = esResult.data.map((page) => { return page._id });
       const findResult = await Page.findListByPageIds(ids);
-
+      // add tags and elasticSearch data to page
       findResult.pages.map((page) => {
         const data = esResult.data.find((data) => {
           return page.id === data._id;

+ 1 - 1
packages/app/src/server/service/search.js

@@ -160,7 +160,7 @@ class SearchService {
       const highlightData = data._highlight;
       const snippet = highlightData['body.en'] || highlightData['body.ja'];
       elasticSearchResult.snippet = myXss.process(snippet);
-      if (highlightData['path.en'] != null && highlightData['path.ja'] != null) {
+      if (highlightData['path.en'] != null || highlightData['path.ja'] != null) {
         const pathMatch = highlightData['path.en'] || highlightData['path.ja'];
         elasticSearchResult.matchedPath = pathMatch;
       }