CreatBot/CreatBotMainsail
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix: update panel invalid version number

Browse Source 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
This commit is contained in:
Stefan Dej
2021-03-03 20:59:55 +01:00
parent 0ba6455513
commit ba6700b80c
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/panels/Settings/UpdatePanel.vue
View File

@@ -154,7 +154,7 @@
if ('is_dirty' in object && object.is_dirty) return 'orange' if ('is_dirty' in object && object.is_dirty) return 'orange'
if ('is_valid' in object && !object.is_valid) return 'red' if ('is_valid' in object && !object.is_valid) return 'red'
if ('version' in object && 'remote_version' in object && semver.gt(object.remote_version, object.version)) return 'primary' if ('version' in object && 'remote_version' in object && semver.valid(object.remote_version) && semver.gt(object.remote_version, object.version)) return 'primary'
return 'green' return 'green'
} }
@@ -167,7 +167,7 @@
if ('is_valid' in object && !object.is_valid) return 'invalid' if ('is_valid' in object && !object.is_valid) return 'invalid'
if ('is_dirty' in object && object.is_dirty) return 'dirty' if ('is_dirty' in object && object.is_dirty) return 'dirty'
if ('version' in object && 'remote_version' in object && semver.gt(object.remote_version, object.version)) return 'update' if ('version' in object && 'remote_version' in object && semver.valid(object.remote_version) && semver.gt(object.remote_version, object.version)) return 'update'
return 'up-to-date' return 'up-to-date'
} }
@@ -180,7 +180,7 @@
if ('is_valid' in object && !object.is_valid) return 'alert-circle' if ('is_valid' in object && !object.is_valid) return 'alert-circle'
if ('is_dirty' in object && object.is_dirty) return 'alert-circle' if ('is_dirty' in object && object.is_dirty) return 'alert-circle'
if ('version' in object && 'remote_version' in object && semver.gt(object.remote_version, object.version)) return 'progress-upload' if ('version' in object && 'remote_version' in object && semver.valid(object.remote_version) && semver.gt(object.remote_version, object.version)) return 'progress-upload'
return 'check' return 'check'
} }
@@ -193,7 +193,7 @@
if (typeof object === 'object' && object !== false) { if (typeof object === 'object' && object !== false) {
if ('is_valid' in object && !object.is_valid) return true if ('is_valid' in object && !object.is_valid) return true
if ('version' in object && 'remote_version' in object && semver.gt(object.remote_version, object.version)) return false if ('version' in object && 'remote_version' in object && semver.valid(object.remote_version) && semver.gt(object.remote_version, object.version)) return false
} }
return true return true
@@ -211,7 +211,10 @@
} }
if (output !== "") output += ": " if (output !== "") output += ": "
output += semver.gt(remote_version, local_version) ? local_version+" > "+remote_version : local_version if (semver.valid(remote_version) && semver.valid(local_version) && semver.gt(remote_version, local_version))
output += local_version+" > "+remote_version
else
output += local_version
return output return output
}, },