rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Account for server version being undefined in old releases

Browse source
This commit is contained in:
jtc42 2019-06-07 16:35:26 +01:00
parent 61121b0781
commit 293409b39c
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/components/paneConnect.vue
View file

@ -132,14 +132,17 @@ export default {
checkServerVersion: function () { checkServerVersion: function () {
this.$store.dispatch('updateState') this.$store.dispatch('updateState')
.then (() => { .then (() => {
console.log(this.$store.state.apiState.version)
var serverVersion = this.$store.state.apiState.version
var serverVersionMajor = serverVersion.substring(0, 3)
console.log(serverVersionMajor)
var clientVersion = process.env.PACKAGE_VERSION var clientVersion = process.env.PACKAGE_VERSION
var clientVersionMajor = clientVersion.substring(0, 3) var clientVersionMajor = clientVersion.substring(0, 3)
console.log(clientVersionMajor) console.log(clientVersionMajor)
if (serverVersionMajor != clientVersionMajor) {
var serverVersion = this.$store.state.apiState.version
if (serverVersion != undefined) {
var serverVersionMajor = serverVersion.substring(0, 3)
}
console.log(serverVersionMajor)
if ((serverVersion == undefined) || (serverVersionMajor != clientVersionMajor)) {
this.modalDialog("Version mismatch", "Client and microscope versions do not match. Consider updating your microscope software. Some functionality may currently be broken.", status='warning') this.modalDialog("Version mismatch", "Client and microscope versions do not match. Consider updating your microscope software. Some functionality may currently be broken.", status='warning')
} }
}) })