Browse Source

fix: aws cloudsearch empty fields query

Nick 6 năm trước cách đây
mục cha
commit
c236cfdff9

+ 2 - 2
server/modules/search/aws/engine.js

@@ -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),
-          description: _.head(r.fields.description)
+          title: _.head(r.fields.title) || '',
+          description: _.head(r.fields.description) || ''
         })),
         })),
         suggestions: suggestions,
         suggestions: suggestions,
         totalHits: results.hits.found
         totalHits: results.hits.found

+ 1 - 1
server/modules/storage/git/storage.js

@@ -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)