liz/wikijs-fork
liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: aws cloudsearch empty fields query

Browse Source
This commit is contained in:
Nick 2019-03-16 18:47:00 -04:00
parent 6eb6eecfa2
commit c236cfdff9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/search/aws/engine.js
View File

@ -167,8 +167,8 @@ module.exports = {
id: r.id, id: r.id,
path: _.head(r.fields.path), path: _.head(r.fields.path),
locale: _.head(r.fields.locale), locale: _.head(r.fields.locale),
title: _.head(r.fields.title), title: _.head(r.fields.title) || '',
description: _.head(r.fields.description) description: _.head(r.fields.description) || ''
})), })),
suggestions: suggestions, suggestions: suggestions,
totalHits: results.hits.found totalHits: results.hits.found

2
server/modules/storage/git/storage.js
View File

@ -145,7 +145,7 @@ module.exports = {
if (_.includes(['sync', 'pull'], this.mode)) { if (_.includes(['sync', 'pull'], this.mode)) {
const latestCommitLog = _.get(await this.git.log(['-n', '1', this.config.branch]), 'latest', {}) const latestCommitLog = _.get(await this.git.log(['-n', '1', this.config.branch]), 'latest', {})
const diff = await this.git.diffSummary([currentCommitLog.hash, latestCommitLog.hash]) const diff = await this.git.diffSummary(['-M', currentCommitLog.hash, latestCommitLog.hash])
if (_.get(diff, 'files', []).length > 0) { if (_.get(diff, 'files', []).length > 0) {
for(const item of diff.files) { for(const item of diff.files) {
const contentType = getContenType(item.file) const contentType = getContenType(item.file)