Added simple library for progress
This commit is contained in:
parent
0e777c4d75
commit
cce399a7a6
3 changed files with 36 additions and 3 deletions
|
|
@ -24,6 +24,7 @@ import os
|
|||
import configparser
|
||||
from collections import OrderedDict
|
||||
from importlib import import_module, reload
|
||||
from modules.pastafari2.libraries.progress import load_progress
|
||||
|
||||
try:
|
||||
import ujson as json
|
||||
|
|
@ -270,7 +271,7 @@ def pastafari2_add_server_task():
|
|||
def pastafari2_progress():
|
||||
|
||||
db=g.connection
|
||||
|
||||
"""
|
||||
task_id=request.args.get('task_id', '0')
|
||||
|
||||
position=request.args.get('position', '0')
|
||||
|
|
@ -279,14 +280,21 @@ def pastafari2_progress():
|
|||
|
||||
arr_task=task.set_conditions('WHERE id=%s', [task_id]).select_a_row_where()
|
||||
|
||||
url_return=arr_task['url_return']
|
||||
|
||||
#print(url_return)
|
||||
|
||||
#print(arr_task)
|
||||
if arr_task:
|
||||
return t.load_template('progress.phtml', title=I18n.lang('pastafari2', 'task_progress', 'Task progress'), path_module='admin_app.pastafari2_dashboard', name_task=arr_task['name_task'], description_task=arr_task['description_task'], position=position, task_id=task_id, server=arr_task['server'], hostname=arr_task['hostname'], url_return=arr_task['url_return'])
|
||||
return t.load_template('progress.phtml', title=I18n.lang('pastafari2', 'task_progress', 'Task progress'), path_module='admin_app.pastafari2_dashboard', name_task=arr_task['name_task'], description_task=arr_task['description_task'], position=position, task_id=task_id, server=arr_task['server'], hostname=arr_task['hostname'], url_return=url_return)
|
||||
else:
|
||||
|
||||
return ""
|
||||
|
||||
|
||||
"""
|
||||
|
||||
return load_progress(db, t)
|
||||
|
||||
|
||||
@admin_app.route('/pastafari2/getprogress/', methods=['POST'])
|
||||
def pastafari2_getprogress():
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue