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
830ddd9d
Commit
830ddd9d
authored
Feb 02, 2019
by
Nick
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: await page render to finish before resolving
parent
e3943439
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
3 deletions
+10
-3
.gitignore
.gitignore
+2
-0
CHANGELOG.md
CHANGELOG.md
+1
-0
README.md
README.md
+1
-1
pages.js
server/models/pages.js
+2
-1
definition.yml
server/modules/storage/disk/definition.yml
+0
-1
definition.yml
server/modules/storage/git/definition.yml
+4
-0
No files found.
.gitignore
View file @
830ddd9d
...
...
@@ -17,6 +17,8 @@ npm-debug.log*
# Generated assets
/assets
server/views/master.pug
server/views/setup.pug
# Webpack
.webpack-cache
...
...
CHANGELOG.md
View file @
830ddd9d
...
...
@@ -13,6 +13,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
-
Fixed root admin refresh token fail
-
Fixed error page metadata title warning
-
Fixed telemetry
-
Await page render job to complete before resolving
### Changed
-
Moved Insert Media button in Markdown editor
...
...
README.md
View file @
830ddd9d
...
...
@@ -65,7 +65,7 @@ Wiki.js can run on virtually all platforms where Node.js can (Windows, Mac, Linu
-
MariaDB
**10.2.7**
or later
-
Microsoft SQL Server
**2012**
or later
-
SQLite
**3.9**
or later
-
Redis
**3.
2
**
or later
-
Redis
**3.
0
**
or later
> Read the full [prerequisites](https://docs-beta.requarks.io/install/requirements) article for full details.
...
...
server/models/pages.js
View file @
830ddd9d
...
...
@@ -197,13 +197,14 @@ module.exports = class Page extends Model {
static
async
renderPage
(
page
)
{
const
pipeline
=
await
WIKI
.
models
.
renderers
.
getRenderingPipeline
(
page
.
contentType
)
WIKI
.
queue
.
job
.
renderPage
.
add
({
const
renderJob
=
await
WIKI
.
queue
.
job
.
renderPage
.
add
({
page
,
pipeline
},
{
removeOnComplete
:
true
,
removeOnFail
:
true
})
return
renderJob
.
finished
()
}
static
async
getPage
(
opts
)
{
...
...
server/modules/storage/disk/definition.yml
View file @
830ddd9d
...
...
@@ -5,7 +5,6 @@ author: requarks.io
logo
:
https://static.requarks.io/logo/local-fs.svg
website
:
https://wiki.js.org
supportedModes
:
-
sync
-
push
props
:
path
:
...
...
server/modules/storage/git/definition.yml
View file @
830ddd9d
...
...
@@ -4,6 +4,10 @@ description: Git is a version control system for tracking changes in computer fi
author
:
requarks.io
logo
:
https://static.requarks.io/logo/git-alt.svg
website
:
https://git-scm.com/
supportedModes
:
-
sync
-
push
-
pull
props
:
authType
:
type
:
String
...
...
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