From 8d12bac8c8e697b6e95c286fb17b6d91a2ba037b Mon Sep 17 00:00:00 2001 From: Stefan Dej Date: Sun, 27 Dec 2020 22:02:22 +0100 Subject: [PATCH] bugfix: update manager > update mainsail button show the wrong state Signed-off-by: Stefan Dej --- src/components/panels/Settings/UpdatePanel.vue | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/components/panels/Settings/UpdatePanel.vue b/src/components/panels/Settings/UpdatePanel.vue index 4e84d6fc..22e21f8e 100644 --- a/src/components/panels/Settings/UpdatePanel.vue +++ b/src/components/panels/Settings/UpdatePanel.vue @@ -133,10 +133,7 @@ if ('current_hash' in object && 'remote_hash' in object && object.current_hash !== object.remote_hash) return 'primary' if ('name' in object && object.name === "mainsail") { - let remote_version = object.remote_version.split(' ') - remote_version = (remote_version.length > 1) ? remote_version[1] : remote_version[0] - - if (this.package_version !== remote_version) return 'primary' + if ('v'+this.package_version !== object.remote_version.replace('Version ', 'v')) return 'primary' } return 'green' @@ -152,10 +149,7 @@ if ('current_hash' in object && 'remote_hash' in object && object.current_hash !== object.remote_hash) return 'update' if ('name' in object && object.name === "mainsail") { - let remote_version = object.remote_version.split(' ') - remote_version = (remote_version.length > 1) ? remote_version[1] : remote_version[0] - - if (this.package_version !== remote_version) return 'update' + if ('v'+this.package_version !== object.remote_version.replace('Version ', 'v')) return 'update' } return 'up-to-date' @@ -171,10 +165,7 @@ if ('current_hash' in object && 'remote_hash' in object && object.current_hash !== object.remote_hash) return 'progress-upload' if ('name' in object && object.name === "mainsail") { - let remote_version = object.remote_version.split(' ') - remote_version = (remote_version.length > 1) ? remote_version[1] : remote_version[0] - - if (this.package_version !== remote_version) return 'progress-upload' + if ('v'+this.package_version !== object.remote_version.replace('Version ', 'v')) return 'progress-upload' } return 'check'