Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wiki-js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
wiki-js
Commits
a5c73892
Commit
a5c73892
authored
Aug 10, 2017
by
NGPixel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: hotfix 1.0.6
parent
a6254364
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
_tasks.js
.build/_tasks.js
+1
-1
config.js
server/libs/config.js
+1
-1
entries.js
server/libs/entries.js
+4
-1
No files found.
.build/_tasks.js
View file @
a5c73892
...
@@ -76,7 +76,7 @@ module.exports = Promise.mapSeries([
...
@@ -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
)
...
...
server/libs/config.js
View file @
a5c73892
...
@@ -53,7 +53,7 @@ module.exports = (confPaths) => {
...
@@ -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!'
))
...
...
server/libs/entries.js
View file @
a5c73892
...
@@ -378,9 +378,12 @@ module.exports = {
...
@@ -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
(
db
.
Entry
.
deleteOne
({
_id
:
entryPath
}),
self
.
updateCache
(
newEntryPath
).
then
(
entry
=>
{
return
search
.
add
(
entry
)
return
search
.
add
(
entry
)
})
})
)
})
})
})
})
},
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment