From b7039573a4f49d52369909f07137c674c1c97c0d Mon Sep 17 00:00:00 2001 From: Andrew Date: Fri, 19 Nov 2021 22:17:24 -0500 Subject: [PATCH] Maybe I fixed backups? Another attempt at allowing windows users to think about what they did by choosing windows to run a server on while also deleting backups --- app/classes/web/panel_handler.py | 3 +++ app/frontend/templates/panel/server_backup.html | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py index 4ad1758b..153df1ad 100644 --- a/app/classes/web/panel_handler.py +++ b/app/classes/web/panel_handler.py @@ -206,8 +206,11 @@ class PanelHandler(BaseHandler): page_data['user_permissions'] = self.controller.server_perms.get_server_permissions_foruser(exec_user_id, server_id) if subpage == "backup": + server_info = self.controller.servers.get_server_data_by_id(server_id) page_data['backup_config'] = self.controller.management.get_backup_config(server_id) page_data['backup_list'] = server.list_backups() + page_data['backup_path'] = server_info["backup_path"] + print(page_data['backup_path']) def get_banned_players_html(): banned_players = self.controller.servers.get_banned_players(server_id) diff --git a/app/frontend/templates/panel/server_backup.html b/app/frontend/templates/panel/server_backup.html index e90438f4..8650aee9 100644 --- a/app/frontend/templates/panel/server_backup.html +++ b/app/frontend/templates/panel/server_backup.html @@ -204,8 +204,7 @@ callback: function (result) { console.log(result); if (result == true) { - var full_path = '{{ data['server_stats']['server_id']['backup_path'] }}' + '/' + file_to_del; - console.log(full_path); + var full_path = '{{ data['backup_path'] }}' + '/' + file_to_del; del_backup(full_path, {{ data['server_stats']['server_id']['server_id'] }} ); } }