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

fix: convert page - task list + UI fixes

Browse Source
This commit is contained in:
NGPixel 2021-04-02 15:15:35 -04:00
parent 26f1c0f372
commit 84b927915e
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/components/common/page-convert.vue
View File

@ -100,9 +100,7 @@ export default {
}) })
if (_.get(resp, 'data.pages.convert.responseResult.succeeded', false)) { if (_.get(resp, 'data.pages.convert.responseResult.succeeded', false)) {
this.isShown = false this.isShown = false
_.delay(() => {
window.location.assign(`/e/${this.pageLocale}/${this.pagePath}`) window.location.assign(`/e/${this.pageLocale}/${this.pagePath}`)
}, 400)
} else { } else {
throw new Error(_.get(resp, 'data.pages.convert.responseResult.message', this.$t('common:error.unexpected'))) throw new Error(_.get(resp, 'data.pages.convert.responseResult.message', this.$t('common:error.unexpected')))
} }

2
client/components/editor/editor-modal-editorselect.vue
View File

@ -96,7 +96,7 @@
img(src='/_assets/svg/editor-icon-ckeditor.svg', alt='Visual Editor', style='width: 36px;') img(src='/_assets/svg/editor-icon-ckeditor.svg', alt='Visual Editor', style='width: 36px;')
.body-2.mt-2.primary--text Visual Editor .body-2.mt-2.primary--text Visual Editor
.caption.grey--text Rich-text WYSIWYG .caption.grey--text Rich-text WYSIWYG
.caption.blue--text.text--lighten-2 {{$t('editor:select.cannotChange')}} //- .caption.blue--text.text--lighten-2 {{$t('editor:select.cannotChange')}}
v-card.radius-7.mt-2(color='teal darken-3', dark) v-card.radius-7.mt-2(color='teal darken-3', dark)
v-card-text.text-center.py-4 v-card-text.text-center.py-4

13
server/models/pages.js
View File

@ -488,6 +488,10 @@ module.exports = class Page extends Model {
throw new Error('Invalid Page Id') throw new Error('Invalid Page Id')
} }
if (ogPage.editorKey === opts.editor) {
throw new Error('Page is already using this editor. Nothing to convert.')
}
// -> Check for page access // -> Check for page access
if (!WIKI.auth.checkAccess(opts.user, ['write:pages'], { if (!WIKI.auth.checkAccess(opts.user, ['write:pages'], {
locale: ogPage.localeCode, locale: ogPage.localeCode,
@ -561,6 +565,15 @@ module.exports = class Page extends Model {
replacement: c => `_${c}_` replacement: c => `_${c}_`
}) })
td.addRule('taskList', {
filter: (n, o) => {
return n.nodeName === 'INPUT' && n.getAttribute('type') === 'checkbox'
},
replacement: (c, n) => {
return n.getAttribute('checked') ? '[x] ' : '[ ] '
}
})
td.addRule('removeTocAnchors', { td.addRule('removeTocAnchors', {
filter: (n, o) => { filter: (n, o) => {
return n.nodeName === 'A' && n.classList.contains('toc-anchor') return n.nodeName === 'A' && n.classList.contains('toc-anchor')