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
7c59bfed
Commit
7c59bfed
authored
Apr 24, 2020
by
NGPixel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: browse tree ancestors not converted in mariadb
parent
e0a04346
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
page.js
server/graph/resolvers/page.js
+1
-1
setup.js
server/setup.js
+3
-1
No files found.
server/graph/resolvers/page.js
View file @
7c59bfed
...
...
@@ -227,7 +227,7 @@ module.exports = {
}
else
{
builder
.
where
(
'parent'
,
args
.
parent
)
if
(
args
.
includeAncestors
&&
curPage
&&
curPage
.
ancestors
.
length
>
0
)
{
builder
.
orWhereIn
(
'id'
,
curPage
.
ancestors
)
builder
.
orWhereIn
(
'id'
,
_
.
isString
(
curPage
.
ancestors
)
?
JSON
.
parse
(
curPage
.
ancestors
)
:
curPage
.
ancestors
)
}
}
}).
orderBy
([{
column
:
'isFolder'
,
order
:
'desc'
},
'title'
])
...
...
server/setup.js
View file @
7c59bfed
...
...
@@ -323,7 +323,9 @@ module.exports = () => {
kind
:
'link'
,
label
:
'Home'
,
target
:
'/'
,
targetType
:
'home'
targetType
:
'home'
,
visibilityMode
:
'all'
,
visibilityGroups
:
null
}
]
}
...
...
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