Fixes in dashboard
This commit is contained in:
parent
b4d3f1807f
commit
0b509f74e5
1 changed files with 8 additions and 5 deletions
|
|
@ -529,6 +529,8 @@ def pastafari2_make_task():
|
||||||
|
|
||||||
task_id=0
|
task_id=0
|
||||||
|
|
||||||
|
data={}
|
||||||
|
|
||||||
#if not os.path.isfile(task)
|
#if not os.path.isfile(task)
|
||||||
|
|
||||||
if send_task=='':
|
if send_task=='':
|
||||||
|
|
@ -558,6 +560,9 @@ def pastafari2_make_task():
|
||||||
|
|
||||||
return {'error': error, 'txt_error': txt_error, 'error_form': error_form, 'task_id': task_id}
|
return {'error': error, 'txt_error': txt_error, 'error_form': error_form, 'task_id': task_id}
|
||||||
|
|
||||||
|
for k, v in task_first.data.items():
|
||||||
|
data[k]=v
|
||||||
|
|
||||||
pass
|
pass
|
||||||
|
|
||||||
#print(ids)
|
#print(ids)
|
||||||
|
|
@ -572,21 +577,19 @@ def pastafari2_make_task():
|
||||||
|
|
||||||
#Load task, check if have question
|
#Load task, check if have question
|
||||||
|
|
||||||
data={}
|
|
||||||
|
|
||||||
server_host=''
|
server_host=''
|
||||||
|
|
||||||
user=config_task.remote_user
|
user=config_task.remote_user
|
||||||
|
|
||||||
ssh_key_priv='./ssh/id_rsa'
|
ssh_key_priv='./ssh/id_rsa'
|
||||||
"""
|
|
||||||
if not task.run_task(server_host, path_task, 'Update server', 'update_server', 'Task for update servers', user=user, password='', where_sql_server=where_sql, ssh_key_priv=ssh_key_priv, url='', data=data, send_task=True):
|
if not task.run_task(server_host, path_task, task_first.name_task, task_first.codename_task, task_first.description_task, user=user, password='', where_sql_server=where_sql, ssh_key_priv=ssh_key_priv, url='', data=data, send_task=True):
|
||||||
|
|
||||||
error=1
|
error=1
|
||||||
error_form['#server_host_error']=I18n.lang('pastafari2', 'error_exec_task', 'Error: cannot execute the task')
|
error_form['#server_host_error']=I18n.lang('pastafari2', 'error_exec_task', 'Error: cannot execute the task')
|
||||||
|
|
||||||
task_id=task.task_id
|
task_id=task.task_id
|
||||||
"""
|
|
||||||
return {'error': error, 'txt_error': txt_error, 'error_form': error_form, 'task_id': task_id}
|
return {'error': error, 'txt_error': txt_error, 'error_form': error_form, 'task_id': task_id}
|
||||||
|
|
||||||
@admin_app.route('/pastafari2/multiprogress/')
|
@admin_app.route('/pastafari2/multiprogress/')
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue