From 1fbe315ed7aca8534cbb3883fbb9e3830c1e9aad Mon Sep 17 00:00:00 2001 From: wez3 Date: Sat, 21 Jan 2017 20:59:00 +0100 Subject: [PATCH 1/2] Upgrades from Numbers to String --- VERSION.md | 2 +- static/js/domoboard.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION.md b/VERSION.md index 90a27f9..af0b7dd 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -1.0.5 +1.0.6 diff --git a/static/js/domoboard.js b/static/js/domoboard.js index 4233c39..c0f51cd 100644 --- a/static/js/domoboard.js +++ b/static/js/domoboard.js @@ -436,7 +436,7 @@ function checkVersion(branch) { } else { dataFloat = data.split(",")[1]; } - if (Number(dataFloat) > Number(version)) { + if (dataFloat > version) { document.getElementById('curver').innerHTML = version; document.getElementById('newver').innerHTML = dataFloat; $( "#version_div" ).removeClass("hide_update"); @@ -457,7 +457,7 @@ function checkVersionSettings(branch) { } else { dataFloat = data.split(",")[1]; } - if (Number(dataFloat) > Number(version)) { + if (dataFloat > version) { $( "#updateView_available" ).removeClass("hide_update"); $( "#updateView_available" ).addClass("show_update"); document.getElementById('curver_settings').innerHTML = version; From 7a71e206f93694045e5c063c43e125b59bab2491 Mon Sep 17 00:00:00 2001 From: wez3 Date: Sat, 21 Jan 2017 21:02:23 +0100 Subject: [PATCH 2/2] Change webconfig.py git pull request for upgrades --- modules/webconfig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/webconfig.py b/modules/webconfig.py index bed15e1..6b63d70 100644 --- a/modules/webconfig.py +++ b/modules/webconfig.py @@ -19,7 +19,7 @@ def getVersion(): return version def performUpgrade(): - git.cmd.Git('.').pull("https://github.com/wez3/domoboard.git") + git.cmd.Git('.').pull() return "Upgrade completed." def getCurrentBranch():