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

fix: use semver for latest version check

Browse Source
This commit is contained in:
NGPixel 2020-05-11 00:09:10 -04:00
parent 7508d92f92
commit 1a33a43a0d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/components/admin/admin-dashboard.vue
View File

@ -110,6 +110,7 @@ import _ from 'lodash'
import AnimatedNumber from 'animated-number-vue' import AnimatedNumber from 'animated-number-vue'
import { get } from 'vuex-pathify' import { get } from 'vuex-pathify'
import gql from 'graphql-tag' import gql from 'graphql-tag'
import semverLte from 'semver/functions/lte'
export default { export default {
components: { components: {
@ -134,7 +135,7 @@ export default {
}, },
computed: { computed: {
isLatestVersion() { isLatestVersion() {
return this.info.currentVersion === this.info.latestVersion return semverLte(this.info.latestVersion, this.info.currentVersion)
}, },
info: get('admin/info'), info: get('admin/info'),
permissions: get('user/permissions') permissions: get('user/permissions')

1
server/modules/rendering/html-tabset/renderer.js
View File

@ -14,7 +14,6 @@ module.exports = {
tabContent += $.html(celm) tabContent += $.html(celm)
$(celm).remove() $(celm).remove()
}) })
console.info(tabContent)
tabContents.push(`<div class="tabset-panel">${tabContent}</div>`) tabContents.push(`<div class="tabset-panel">${tabContent}</div>`)
$(hd).remove() $(hd).remove()
}) })