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

Fixes in pastafari

Browse source
This commit is contained in:
Antonio de la Rosa 2022-04-25 01:25:03 +02:00
parent ff93c78831
commit b4d3f1807f
3 changed files with 87 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

46
admin/dashboard.py
View file

@ -501,11 +501,14 @@ def pastafari2_make_task():
db=g.connection
ids=json.loads(request.form.get('ids', '[]'))
json_ids=json.dumps(ids)
arr_ids=[]
task_file=request.form.get('task', '')
task_path=request.form.get('task', '')
task_file=task_file.replace('/', '.')
task_file=task_path.replace('/', '.')
task_file=task_file.replace('.py', '')
@ -518,6 +521,14 @@ def pastafari2_make_task():
send_task=request.args.get('send_task', '')
error=0
txt_error=''
error_form={}
task=Task(db)
task_id=0
#if not os.path.isfile(task)
if send_task=='':
@ -526,13 +537,28 @@ def pastafari2_make_task():
if hasattr(task_first, 'form'):
url_exec=url_for('.pastafari2_make_task', ids=ids, task_file=task_file, send_task=1)
url_exec=url_for('.pastafari2_make_task', send_task=1)
return t.load_template('maketask.phtml', form=task_first.form(t, yes_error=False, pass_values=False), url_exec=url_exec)
return t.load_template('maketask.phtml', title=I18n.lang('pastafari2', 'make_task', 'Make task'), form=task_first.form(t, yes_error=False, pass_values=False), url_exec=url_exec, ids=json_ids, task_file=task_path)
error=0
txt_error=''
error_form={}
elif send_task!='':
if hasattr(task_first, 'form'):
#Check form
if not task_first.check_form(request.form):
error=1
txt_error=I18n.lang('pastafari2', 'error_fields_required', 'Errors: fields required')
for k,v in task_first.arr_form.items():
if task_first.arr_form[k].error:
error_form['#'+k+'_error']=task_first.arr_form[k].txt_error
return {'error': error, 'txt_error': txt_error, 'error_form': error_form, 'task_id': task_id}
pass
#print(ids)
for v in ids:
@ -542,11 +568,7 @@ def pastafari2_make_task():
#print(where_sql)
task=Task(db)
task_id=0
path_task='modules.pastafari2.tasks.system.updates'
path_task=task_file
#Load task, check if have question