Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix update notifications.

Browse Source
This commit is contained in:
Andrew 2021-11-27 18:32:53 -05:00
parent 12c4c9ec45
commit c7d3b3aa1c
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/classes/shared/server.py
View File

@ -541,15 +541,14 @@ class Server:
# There are clients # There are clients
self.check_update() self.check_update()
message = '<a data-id="'+str(self.server_id)+'" class=""> UPDATING...</i></a>' message = '<a data-id="'+str(self.server_id)+'" class=""> UPDATING...</i></a>'
page_params = {id: self.server_id} websocket_helper.broadcast_page('/panel/server_detail', 'update_button_status', {
websocket_helper.broadcast_page_params('server_detail', page_params, 'update_button_status', {
'isUpdating': self.check_update(), 'isUpdating': self.check_update(),
'server_id': self.server_id, 'server_id': self.server_id,
'wasRunning': wasStarted, 'wasRunning': wasStarted,
'string': message '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') backup_dir = os.path.join(helper.get_os_understandable_path(self.settings['path']), 'crafty_executable_backups')
#checks if backup directory already exists #checks if backup directory already exists
if os.path.isdir(backup_dir): if os.path.isdir(backup_dir):
@ -585,13 +584,13 @@ class Server:
self.check_update() self.check_update()
websocket_helper.broadcast('notification', "Executable update finished for " + self.name) websocket_helper.broadcast('notification', "Executable update finished for " + self.name)
time.sleep(3) 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(), 'isUpdating': self.check_update(),
'server_id': self.server_id, 'server_id': self.server_id,
'wasRunning': wasStarted '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) 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']) management_helper.add_to_audit_log_raw('Alert', '-1', self.server_id, "Executable update finished for "+self.name, self.settings['server_ip'])

6
app/frontend/templates/panel/server_term.html
View File

@ -127,13 +127,17 @@
if (webSocket) { if (webSocket) {
webSocket.on('update_button_status', function (updateButton) { webSocket.on('update_button_status', function (updateButton) {
if (updateButton.isUpdating){ if (updateButton.isUpdating){
if(updateButton.server_id == '{{ data['server_stats']['server_id']['server_id'] }}') {
console.log(updateButton.isUpdating) 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>'; 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{ else{
if (updateButton.server_id == '{{ data['server_stats']['server_id']['server_id'] }}') {
window.location.reload() 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>'; 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 // Convert running to lower case (example: 'True' converts to 'true') and