diff --git a/admin/dashboard.py b/admin/dashboard.py index ab670f4..ddd8d78 100644 --- a/admin/dashboard.py +++ b/admin/dashboard.py @@ -519,9 +519,12 @@ def pastafari2_get_multiprogress(): ids=request.args.get('ids', '[]') - position=0 + #position=0 - #position=int(request.args.get('position', '0')) + try: + position=int(request.args.get('position', '0')) + except: + position=0 final_ids=[str(i) for i in json.loads(ids)] diff --git a/templates/admin/multiprogress.phtml b/templates/admin/multiprogress.phtml index 95b82f6..f1c1bda 100644 --- a/templates/admin/multiprogress.phtml +++ b/templates/admin/multiprogress.phtml @@ -26,6 +26,8 @@ ids=[]; task_completed=0; +position=0; + //Get all tasks, next process 50 next progress. $.ajax({ url: "${url_for('.pastafari2_get_servers_task')}", @@ -60,7 +62,7 @@ $.ajax({ function get_log() { $.ajax({ - url: "${url_for('.pastafari2_get_multiprogress')}?position=", + url: "${url_for('.pastafari2_get_multiprogress')}?position="+position, data: {ids: JSON.stringify(ids)}, success: function (data) { @@ -84,7 +86,7 @@ function get_log() { task_completed++; - + console.log('Task completed '+data[i].task_id); if(data[i].error==0) { @@ -100,6 +102,8 @@ function get_log() { } + position++; + } },