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

fix: navigation save cache error #780

Browse Source
This commit is contained in:
Nick
2019-03-23 18:40:53 -04:00
parent 81ff24b9b6
commit 2a950575e2
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
client/components/editor/editor-markdown.vue
View File

@@ -51,31 +51,43 @@
span Horizontal Bar span Horizontal Bar
.editor-markdown-main .editor-markdown-main
.editor-markdown-sidebar .editor-markdown-sidebar
v-tooltip(right) //- v-tooltip(right)
v-btn(icon, slot='activator', dark, @click='toggleModal(`editorModalMedia`)').mx-0 //- v-btn(icon, slot='activator', dark, @click='toggleModal(`editorModalMedia`)').mx-0
v-icon(:color='activeModal === `editorModalMedia` ? `teal` : ``') image //- v-icon(:color='activeModal === `editorModalMedia` ? `teal` : ``') image
//- span Insert Media
v-tooltip(right, color='primary')
v-btn(icon, slot='activator', dark).mx-0
v-icon image
span Insert Media span Insert Media
v-tooltip(right) v-tooltip(right, color='primary')
v-btn(icon, slot='activator', dark).mx-0 v-btn(icon, slot='activator', dark).mx-0
v-icon insert_drive_file v-icon insert_drive_file
span Insert File span Insert File
v-tooltip(right) v-tooltip(right, color='primary')
v-btn(icon, slot='activator', dark).mx-0 v-btn(icon, slot='activator', dark).mx-0
v-icon play_circle_outline v-icon play_circle_outline
span Insert Video span Insert Video / Audio
v-tooltip(right) v-tooltip(right, color='primary')
v-btn(icon, slot='activator', dark).mx-0 v-btn(icon, slot='activator', dark).mx-0
v-icon multiline_chart v-icon multiline_chart
span Insert Diagram span Insert Diagram
v-tooltip(right) v-tooltip(right, color='primary')
v-btn(icon, slot='activator', dark).mx-0 v-btn(icon, slot='activator', dark).mx-0
v-icon functions v-icon functions
span Insert Math Expression span Insert Math Expression
v-tooltip(right, color='primary')
v-btn(icon, slot='activator', dark).mx-0
v-icon link
span Insert Link
v-spacer v-spacer
v-tooltip(right) v-tooltip(right, color='primary')
v-btn(icon, slot='activator', dark).mx-0 v-btn(icon, slot='activator', dark).mx-0
v-icon border_outer v-icon border_outer
span Table Helper span Table Helper
v-tooltip(right, color='primary')
v-btn(icon, slot='activator', dark).mx-0
v-icon help
span Markdown Formatting Help
.editor-markdown-editor .editor-markdown-editor
.editor-markdown-editor-title(v-if='previewShown', @click='previewShown = false') Editor .editor-markdown-editor-title(v-if='previewShown', @click='previewShown = false') Editor
.editor-markdown-editor-title(v-else='previewShown', @click='previewShown = true'): v-icon(dark) drag_indicator .editor-markdown-editor-title(v-else='previewShown', @click='previewShown = true'): v-icon(dark) drag_indicator

3
server/graph/resolvers/navigation.js
View File

@@ -1,4 +1,3 @@
const _ = require('lodash')
const graphHelper = require('../../helpers/graph') const graphHelper = require('../../helpers/graph')
/* global WIKI */ /* global WIKI */
@@ -21,7 +20,7 @@ module.exports = {
await WIKI.models.navigation.query().patch({ await WIKI.models.navigation.query().patch({
config: args.tree config: args.tree
}).where('key', 'site') }).where('key', 'site')
await WIKI.redis.set('nav:sidebar', JSON.stringify(args.tree), 'EX', 300) await WIKI.cache.set('nav:sidebar', args.tree, 300)
return { return {
responseResult: graphHelper.generateSuccess('Navigation updated successfully') responseResult: graphHelper.generateSuccess('Navigation updated successfully')