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

fix: hotfix 1.0.6

Browse Source
This commit is contained in:
NGPixel 2017-08-10 21:00:18 -04:00
parent a6254364e9
commit a5c7389206
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.build/_tasks.js
View File

@ -76,7 +76,7 @@ module.exports = Promise.mapSeries([
return Promise.map(langs, lang => { return Promise.map(langs, lang => {
console.info(colors.white(' ' + lang + '.json')) console.info(colors.white(' ' + lang + '.json'))
let outputPath = path.join('./assets/js/i18n', lang + '.json') let outputPath = path.join('./assets/js/i18n', lang + '.json')
return fs.readJsonAsync(path.join('./server/locales', lang + '.json'), 'utf8').then((content) => { return fs.readJsonAsync(path.join('./server/locales', lang + 'browser.json'), 'utf8').then((content) => {
return fs.outputJsonAsync(outputPath, _.defaultsDeep(content, enContent)) return fs.outputJsonAsync(outputPath, _.defaultsDeep(content, enContent))
}).catch(err => { // eslint-disable-line handle-callback-err }).catch(err => { // eslint-disable-line handle-callback-err
return fs.outputJsonAsync(outputPath, enContent) return fs.outputJsonAsync(outputPath, enContent)

2
server/libs/config.js
View File

@ -53,7 +53,7 @@ module.exports = (confPaths) => {
appconfig.authStrategies = { appconfig.authStrategies = {
list: _.filter(appconfig.auth, ['enabled', true]), list: _.filter(appconfig.auth, ['enabled', true]),
socialEnabled: (_.chain(appconfig.auth).omit('local').filter(['enabled', true]).value().length > 0) socialEnabled: (_.chain(appconfig.auth).omit(['local', 'ldap']).filter(['enabled', true]).value().length > 0)
} }
if (appconfig.authStrategies.list.length < 1) { if (appconfig.authStrategies.list.length < 1) {
console.error(new Error('You must enable at least 1 authentication strategy!')) console.error(new Error('You must enable at least 1 authentication strategy!'))

9
server/libs/entries.js
View File

@ -378,9 +378,12 @@ module.exports = {
// Create cache for new entry // Create cache for new entry
return self.updateCache(newEntryPath).then(entry => { return Promise.join(
return search.add(entry) db.Entry.deleteOne({ _id: entryPath }),
}) self.updateCache(newEntryPath).then(entry => {
return search.add(entry)
})
)
}) })
}) })
}, },