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

Fixes in language for use gettext

Browse source
This commit is contained in:
Antonio de la Rosa 2024-04-03 18:31:28 +02:00
parent 6ac7e7598a
commit 283d5249dc
7 changed files with 158 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

62
admin/tasks.py
View file

@ -1,7 +1,7 @@
from settings import config
from flask import g, url_for, request, session, make_response
from flask import g, url_for, request, session, make_response, abort
from paramecio2.libraries.generate_admin_class import GenerateAdminClass
from paramecio2.libraries.i18n import I18n
from paramecio2.libraries.i18n import I18n, PGetText
from paramecio2.modules.admin import admin_app, t as admin_t
from paramecio2.libraries.db.coreforms import SelectForm
from paramecio2.libraries.mtemplates import PTemplate, env_theme
@ -15,7 +15,11 @@ from modules.pastafari2.libraries.task import Task as SSHTask
from modules.pastafari2.libraries.configtask import config_task
from modules.pastafari2.models.tasks import Task, LogTask
from modules.pastafari2.models.pastafari2 import ServerGroup
pgettext=PGetText(__file__+'/../')
_=pgettext.gettext
@admin_app.route('/pastafari2/tasks/', methods=['GET', 'POST'])
def pastafari2_tasks():
@ -46,23 +50,67 @@ def pastafari2_tasks():
if type(form_admin).__name__=='str':
return t.load_template('content.phtml', title=I18n.lang('admin', 'tasks_log', 'Tasks log'), contents=form_admin, path_module='admin_app.pastafari2_tasks')
return t.load_template('content.phtml', title=_('Tasks log'), contents=form_admin, path_module='admin_app.pastafari2_tasks')
else:
return form_admin
return ""
abort(404)
@admin_app.route('/pastafari2/task_log/<int:task_id>', methods=['GET', 'POST'])
def pastafari2_task_log(task_id):
t=admin_t
db=g.connection
logtask=LogTask(db)
url=url_for('admin_app.pastafari2_task_log', task_id=task_id)
logtask.set_conditions('WHERE task_id=%s', task_id)
admin=GenerateAdminClass(logtask, url, t)
admin.list.raw_query=False
#request.args['order']=request.args.get('order', '1')
admin.list.order='1'
admin.list.fields_showed=['id', 'path', 'server', 'progress', 'message', 'error', 'status', 'data']
admin.list.arr_extra_options=[tasks_no_options]
admin.list.limit_pages=100
admin.no_insert=True
admin.no_delete=True
form_admin=admin.show()
if type(form_admin).__name__=='str':
return t.load_template('logtask.phtml', title=_('Task log'), contents=form_admin, path_module='admin_app.pastafari2_tasks')
else:
return form_admin
abort(404)
def tasks_options(url, row_id, row):
if row['is_parent']:
return ['<a target="_blank" href="'+url_for('admin_app.pastafari2_multiprogress', task_id=row_id)+'">'+I18n.lang('pastafari2', 'view_task_log', 'View task log')+'</a>']
return ['<a target="_blank" href="'+url_for('admin_app.pastafari2_multiprogress', task_id=row_id)+'">'+_('View task log')+'</a>']
else:
return ['<a target="_blank" href="'+url_for('admin_app.pastafari2_progress', task_id=row_id)+'">'+I18n.lang('pastafari2', 'view_task_log', 'View task log')+'</a>']
return ['<a target="_blank" href="'+url_for('admin_app.pastafari2_progress', task_id=row_id)+'">'+_('View task log')+'</a>', '<a href="'+url_for('admin_app.pastafari2_task_log', task_id=row_id)+'">'+_('View raw task log')+'</a>']
def tasks_no_options(url, row_id, row):
return ['No options']