haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-02 07:27:04 +00:00
Code Issues Releases Wiki Activity

[cancel zip task] fixup & improvement; also added it for 'shared dir view' page

Browse Source
This commit is contained in:
llj
2018-03-30 14:53:20 +08:00
parent d29ab8a9ac
commit 26dd0baff4
3 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
seahub/api2/endpoints/cancel_zip_task.py
View File

@@ -33,4 +33,4 @@ class CancelZipTaskView(APIView):
error_msg = 'Internal Server Error'
return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
return Response()
return Response({'success': True})

27
seahub/templates/view_shared_dir.html
View File

@@ -207,7 +207,8 @@ $('.shared-dir-zip, .download-dir').on('click', function (e) {
var cur_download_dir_path;
var interval,
zip_token,
queryZipProgress;
queryZipProgress,
cancelZipTask;
var packagingTip = "{% trans "Packaging..." %}";
var $tip = $('<p></p>');
@@ -242,13 +243,35 @@ $('.shared-dir-zip, .download-dir').on('click', function (e) {
});
};
cancelZipTask = function() {
$.ajax({
url: '{% url 'api-v2.1-cancel-zip-task' %}',
type: 'POST',
dataType: 'json',
data: {'token': zip_token},
beforeSend: prepareCSRFToken,
success: function() {
// do nothing
},
error: function(xhr) {
// do nothing
}
});
};
$.ajax({
url: '{% url 'api-v2.1-share-link-zip-task' %}' + '?share_link_token=' + share_link_token + '&path=' + encodeURIComponent(cur_download_dir_path),
cache: false,
dataType: 'json',
success: function(data) {
zip_token = data['zip_token'];
$tip.html(packagingTip).modal();
$tip.html(packagingTip).modal({
onClose: function() {
clearInterval(interval); // stop querying the progress
cancelZipTask();
$.modal.close();
}
});
$('#simplemodal-container').css({'width':'auto'});
queryZipProgress();
interval = setInterval(queryZipProgress, 1000);

23
static/scripts/common.js
View File

@@ -1058,14 +1058,18 @@ define([
});
};
var cancelZipTask = function(){
var cancelZipTask = function() {
$.ajax({
url: _this.getUrl({name: 'cancel_zip_task'}) + '?token=' + zip_token,
success: function(date) {
clearInterval(interval);
url: _this.getUrl({name: 'cancel_zip_task'}),
type: 'POST',
dataType: 'json',
data: {'token': zip_token},
beforeSend: _this.prepareCSRFToken,
success: function() {
// do nothing
},
error: function(xhr) {
_this.ajaxErrorHandler(xhr);
// do nothing
}
});
};
@@ -1083,9 +1087,14 @@ define([
dataType: 'json',
success: function(data) {
zip_token = data['zip_token'];
$tip.html(packagingTip).modal();
$tip.html(packagingTip).modal({
onClose: function() {
clearInterval(interval); // stop querying the progress
cancelZipTask();
$.modal.close();
}
});
$('#simplemodal-container').css({'width':'auto'});
$('.simplemodal-close').click(function(){ cancelZipTask(); });
queryZipProgress();
interval = setInterval(queryZipProgress, 1000);
},