mirror of
https://gitlab.com/crafty-controller/crafty-4.git
synced 2025-01-19 01:35:28 +01:00
Fixes wait window closing after first upload is complete and not waiting for all uploads to complete.
This commit is contained in:
parent
e9f5eae28b
commit
ce4a7619a6
@ -62,16 +62,18 @@ class UploadHandler(tornado.web.RequestHandler):
|
||||
|
||||
def post(self):
|
||||
logger.info("Upload completed")
|
||||
|
||||
files_left = int(self.request.headers.get('X-Files-Left', None))
|
||||
|
||||
if self.do_upload:
|
||||
time.sleep(5)
|
||||
websocket_helper.broadcast('close_upload_box', 'success')
|
||||
if files_left == 0:
|
||||
websocket_helper.broadcast('close_upload_box', 'success')
|
||||
self.finish('success') # Nope, I'm sending "success"
|
||||
self.f.close()
|
||||
else:
|
||||
time.sleep(5)
|
||||
websocket_helper.broadcast('close_upload_box', 'error')
|
||||
if files_left == 0:
|
||||
websocket_helper.broadcast('close_upload_box', 'error')
|
||||
self.finish('error')
|
||||
|
||||
def data_received(self, data):
|
||||
|
@ -525,7 +525,7 @@
|
||||
window.location.href = "/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=files"
|
||||
}
|
||||
|
||||
function sendFile(file, path, server_id, onProgress){
|
||||
function sendFile(file, path, server_id, left, onProgress){
|
||||
var xmlHttpRequest = new XMLHttpRequest();
|
||||
var token = getCookie("_xsrf")
|
||||
var fileName = file.name
|
||||
@ -537,6 +537,7 @@
|
||||
xmlHttpRequest.setRequestHeader('X-XSRFToken', token);
|
||||
xmlHttpRequest.setRequestHeader('X-Content-Disposition', 'attachment; filename="' + fileName + '"');
|
||||
xmlHttpRequest.setRequestHeader('X-Path', path);
|
||||
xmlHttpRequest.setRequestHeader('X-Files-Left', left);
|
||||
xmlHttpRequest.setRequestHeader('X-FileName', fileName);
|
||||
xmlHttpRequest.setRequestHeader('X-ServerId', "{{ data['server_stats']['server_id']['server_id'] }}");
|
||||
xmlHttpRequest.upload.addEventListener('progress', (event) =>
|
||||
@ -620,7 +621,8 @@
|
||||
</div><br>
|
||||
`;
|
||||
$('#upload-progress-bar-parent').append(progressHtml);
|
||||
sendFile(files.files[i], path, server_id, (progress) => {
|
||||
console.log(files.files.length)
|
||||
sendFile(files.files[i], path, server_id, files.files.length - i - 1, (progress) => {
|
||||
$(`#upload-progress-bar-${i + 1}`).attr('aria-valuenow', progress)
|
||||
$(`#upload-progress-bar-${i + 1}`).css('width', progress + '%')
|
||||
});
|
||||
@ -757,7 +759,6 @@
|
||||
hideUploadBox();
|
||||
});
|
||||
}
|
||||
|
||||
function hideUploadBox(){
|
||||
if (!uploadWaitDialog) return;
|
||||
uploadWaitDialog.modal('hide');
|
||||
|
Loading…
x
Reference in New Issue
Block a user