1
0
Fork 0

Merge 'v2.3' into master.

This commit is contained in:
romain 2020-10-08 14:03:30 +02:00
commit afcec56be4
27 changed files with 499 additions and 34 deletions

View file

@ -46,7 +46,6 @@
import config from '../../../package'
import PlatformAuthState from '../platform/PlatformAuthState'
import { mapActions, mapGetters } from 'vuex'
import semverRegex from 'semver-regex'
export default {
name: 'NavBar',
@ -55,7 +54,7 @@ export default {
...mapGetters('core', { coreVersion: 'version' }),
version () {
if (!this.coreVersion.Version) return null
return semverRegex().test(this.coreVersion.Version)
return /^(v?\d+\.\d+)/.test(this.coreVersion.Version)
? this.coreVersion.Version
: this.coreVersion.Version.substring(0, 7)
},