From a8449cc6f29e49207e1a253bc98844cdcb9178f5 Mon Sep 17 00:00:00 2001 From: Andrew McManus Date: Mon, 26 Jul 2021 21:08:46 -0400 Subject: [PATCH] Cleanup update code --- app/classes/shared/server.py | 4 +--- app/frontend/templates/panel/dashboard.html | 10 ---------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py index 9a0674a5..d4dc5e9a 100644 --- a/app/classes/shared/server.py +++ b/app/classes/shared/server.py @@ -439,15 +439,13 @@ class Server: time.sleep(5) db_helper.set_update(self.server_id, False) - dashOffHtmlString = '    ' if len(websocket_helper.clients) > 0: # There are clients self.check_update() websocket_helper.broadcast('update_button_status', { 'isUpdating': self.check_update(), 'server_id': self.server_id, - 'wasRunning': wasStarted, - 'dashOffGetString': dashOffHtmlString + 'wasRunning': wasStarted }) time.sleep(3) websocket_helper.broadcast('notification', "Executable update finished for "+self.name) diff --git a/app/frontend/templates/panel/dashboard.html b/app/frontend/templates/panel/dashboard.html index a515a93d..ce79709e 100644 --- a/app/frontend/templates/panel/dashboard.html +++ b/app/frontend/templates/panel/dashboard.html @@ -286,23 +286,13 @@ $( document ).ready(function() { webSocket.on('update_button_status', function (updateButton) { var id = 'controls'; var dataId = updateButton.server_id; - console.log(dataId) var id = id.concat(updateButton.server_id); - console.log("ID " + id); if (updateButton.isUpdating){ console.log(updateButton.isUpdating) document.getElementById(id).innerHTML = ' UPDATING...'; } else{ window.location.reload() - if (updateButton.wasStarted){ - document.getElementById(id).innerHTML = '    '; - - }else{ - document.getElementById(id).innerHTML = updateButton.dashOffGetString; - console.log(updateButton.dashOffGetString); - - } } }); }