From c7d3b3aa1cf90b526e926b8f2ec9dc5e442a4810 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sat, 27 Nov 2021 18:32:53 -0500
Subject: [PATCH] Fix update notifications.

---
 app/classes/shared/server.py                  | 13 ++++++-------
 app/frontend/templates/panel/server_term.html |  6 +++++-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 119472d1..03b686f9 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -541,15 +541,14 @@ class Server:
             # There are clients
             self.check_update()
             message = '<a data-id="'+str(self.server_id)+'" class=""> UPDATING...</i></a>'
-            page_params = {id: self.server_id}
-            websocket_helper.broadcast_page_params('server_detail', page_params, 'update_button_status', {
+            websocket_helper.broadcast_page('/panel/server_detail', 'update_button_status', {
                 'isUpdating': self.check_update(),
                 'server_id': self.server_id,
                 'wasRunning': wasStarted,
                 'string': message
             })
-        websocket_helper.broadcast_page('dashboard', 'send_start_reload', {
-        })
+            websocket_helper.broadcast_page('/panel/dashboard', 'send_start_reload', {
+            })
         backup_dir = os.path.join(helper.get_os_understandable_path(self.settings['path']), 'crafty_executable_backups')
         #checks if backup directory already exists
         if os.path.isdir(backup_dir):
@@ -585,13 +584,13 @@ class Server:
                     self.check_update()
                     websocket_helper.broadcast('notification', "Executable update finished for " + self.name)
                     time.sleep(3)
-                    websocket_helper.broadcast_page_params('server_detail', page_params, 'update_button_status', {
+                    websocket_helper.broadcast_page('/panel/server_detail', 'update_button_status', {
                         'isUpdating': self.check_update(),
                         'server_id': self.server_id,
                         'wasRunning': wasStarted
                     })
-                websocket_helper.broadcast_page('dashboard', 'send_start_reload', {
-                })
+                    websocket_helper.broadcast_page('/panel/dashboard', 'send_start_reload', {
+                    })
                 websocket_helper.broadcast('notification', "Executable update finished for "+self.name)
 
                 management_helper.add_to_audit_log_raw('Alert', '-1', self.server_id, "Executable update finished for "+self.name, self.settings['server_ip'])
diff --git a/app/frontend/templates/panel/server_term.html b/app/frontend/templates/panel/server_term.html
index 70c8b44a..7ab9e733 100644
--- a/app/frontend/templates/panel/server_term.html
+++ b/app/frontend/templates/panel/server_term.html
@@ -127,13 +127,17 @@
      if (webSocket) {
     webSocket.on('update_button_status', function (updateButton) {
       if (updateButton.isUpdating){
+        if(updateButton.server_id == '{{ data['server_stats']['server_id']['server_id'] }}') {
         console.log(updateButton.isUpdating)
         document.getElementById('control_buttons').innerHTML = '<button onclick="" id="start-btn" style="max-width: 7rem;" class="btn btn-primary m-1 flex-grow-1">{{ translate("serverTerm", "updating", data['lang']) }}</button><button onclick="" id="restart-btn" style="max-width: 7rem;" class="btn btn-outline-primary m-1 flex-grow-1">{% raw translate("serverTerm", "restart", data['lang']) %}</button><button onclick="" id="stop-btn" style="max-width: 7rem;" class="btn btn-danger m-1 flex-grow-1 disabled">{{ translate("serverTerm", "stop", data['lang']) }}</button>';
+        }
       }
       else{
+        if (updateButton.server_id == '{{ data['server_stats']['server_id']['server_id'] }}') {
         window.location.reload()
         document.getElementById('update_control_buttons').innerHTML = '<button onclick="send_command(server_id, "start_server");" id="start-btn" style="max-width: 7rem;" class="btn btn-primary m-1 flex-grow-1">{{ translate("serverTerm", "start", data['lang']) }}</button><button onclick="send_command(server_id, "restart_server");" id="restart-btn" style="max-width: 7rem;" class="btn btn-outline-primary m-1 flex-grow-1">{% raw translate("serverTerm", "restart", data['lang']) %}</button><button onclick="" id="stop-btn" style="max-width: 7rem;" class="btn btn-danger m-1 flex-grow-1 disabled">{{ translate("serverTerm", "stop", data['lang']) }}</button>';
-        }
+        }  
+      }
     });
   }
     // Convert running to lower case (example: 'True' converts to 'true') and