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 bug where no backup dir would exist on clone

Browse Source
This commit is contained in:
Andrew 2022-04-12 17:17:12 -04:00
parent d417950eae
commit 12b0f8326d
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/classes/web/server_handler.py
View File

@ -219,6 +219,7 @@ class ServerHandler(BaseHandler):
new_server_log_file = str( new_server_log_file = str(
Helpers.get_os_understandable_path(server_data.get("log_path")) Helpers.get_os_understandable_path(server_data.get("log_path"))
).replace(server_uuid, new_server_uuid) ).replace(server_uuid, new_server_uuid)
backup_path = os.path.join(self.helper.backup_path, new_server_uuid)
server_port = server_data.get("server_port") server_port = server_data.get("server_port")
server_type = server_data.get("type") server_type = server_data.get("type")
@ -226,7 +227,7 @@ class ServerHandler(BaseHandler):
new_server_name, new_server_name,
new_server_uuid, new_server_uuid,
new_server_path, new_server_path,
"", backup_path,
new_server_command, new_server_command,
new_executable, new_executable,
new_server_log_file, new_server_log_file,

8
app/frontend/templates/panel/dashboard.html
View File

@ -588,11 +588,15 @@
$(".clone_button").click(function () { $(".clone_button").click(function () {
server_id = $(this).attr("data-id"); server_id = $(this).attr("data-id");
send_command(server_id, 'clone_server'); send_command(server_id, 'clone_server');
bootbox.alert({ bootbox.dialog({
backdrop: true, backdrop: true,
title: '{% raw translate("dashboard", "sendingCommand", data["lang"]) %}', title: '{% raw translate("dashboard", "sendingCommand", data["lang"]) %}',
message: '<div align="center"><i class="fas fa-spin fa-spinner"></i> &nbsp; {% raw translate("dashboard", "bePatientClone", data["lang"]) %} </div>' message: '<div align="center"><i class="fas fa-spin fa-spinner"></i> &nbsp; {% raw translate("dashboard", "bePatientClone", data["lang"]) %} </div>',
closeButton: false,
}); });
setTimeout(function () {
location.reload();
}, 5000)
}); });
}); });