paramecio/pastafari2
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Fix in progress

Browse source
This commit is contained in:
Antonio de la Rosa 2022-02-14 12:49:10 +01:00
parent 0c4efc2db3
commit 96b06f24bc
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/tasks.py
View file

@ -34,7 +34,7 @@ def pastafari2_tasks():
#request.args['order']=request.args.get('order', '1')
admin.list.order='1'
admin.list.fields_showed=['id', 'name_task', 'description_task', 'path', 'is_parent', 'server', 'hostname']
admin.list.fields_showed=['id', 'name_task', 'description_task', 'path', 'is_parent', 'server', 'hostname', 'parent_id']
admin.list.arr_extra_options=[tasks_options]

6
models/tasks.py
View file

@ -178,11 +178,11 @@ class Task(WebModel):
sql_insert_values=[]
sql_insert='insert into task (`name_task`, `description_task`, `url_return`, `server`, `hostname`, `data`, `user`, `password`, `path`, `ssh_key_priv`, `ssh_key_password`, `parent_id`) VALUES '
with self.query('select id, hostname from serverdbtask '+where_sql_server) as cursor:
with self.query('select id, hostname, ip from serverdbtask '+where_sql_server) as cursor:
for row in cursor:
arr_task['server']=row['hostname']
sql_insert_values.append("('"+arr_task['name_task']+"', '"+arr_task['description_task']+"', '"+arr_task['url_return']+"', '"+arr_task['server']+"', '"+arr_task['server']+"', '"+arr_task['data']+"', '"+arr_task['user']+"', '"+arr_task['password']+"', '"+arr_task['path']+"', '"+arr_task['ssh_key_priv']+"', '"+arr_task['ssh_key_password']+"', '"+str(task_id)+"')")
arr_task['server']=row['ip'] #row['hostname']
sql_insert_values.append("('"+arr_task['name_task']+"', '"+arr_task['description_task']+"', '"+arr_task['url_return']+"', '"+arr_task['server']+"', '"+row['hostname']+"', '"+arr_task['data']+"', '"+arr_task['user']+"', '"+arr_task['password']+"', '"+arr_task['path']+"', '"+arr_task['ssh_key_priv']+"', '"+arr_task['ssh_key_password']+"', '"+str(task_id)+"')")
#self.insert({'name_task': name_task,'description_task': description_task, 'url_return': url, 'server': server, 'where_sql_server': where_sql_server, 'data': data , 'user': user, 'password': password, 'path': path, 'where_sql_server' : where_sql_server, 'ssh_key_priv': ssh_key_priv, 'ssh_key_password': ssh_key_password})
pass