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

Fixes in sucky things

Browse source
This commit is contained in:
Antonio de la Rosa 2022-04-21 18:04:02 +02:00
parent fbab7917ef
commit e2e9c80647
5 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/dashboard.py
View file

@ -258,7 +258,7 @@ def pastafari2_progress():
#print(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'])
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'])

2
admin/tasks.py
View file

@ -46,7 +46,7 @@ def pastafari2_tasks():
if type(form_admin).__name__=='str':
return t.load_template('content.phtml', title=I18n.lang('admin', 'tasks_edit', 'Tasks edit'), contents=form_admin, path_module='admin_app.pastafari2_tasks')
return t.load_template('content.phtml', title=I18n.lang('admin', 'tasks_log', 'Tasks log'), contents=form_admin, path_module='admin_app.pastafari2_tasks')
else:
return form_admin

17
models/pastafari2.py
View file

@ -41,3 +41,20 @@ class UpdateServerScripts(WebModel):
self.register(FileField('file', './scripts/local/'), True)
self.register(corefields.ForeignKeyField('server_id', ServerDbTask(connection), 11, False, 'id', 'group', select_fields=[]))
self.register(corefields.IntegerField('position'))
class NameServerScripts(WebModel):
def __init__(self, connection=None):
super().__init__(connection)
self.register(corefields.CharField('name'), True)
class ServerScripts(WebModel):
def __init__(self, connection=None):
super().__init__(connection)
self.register(corefields.CharField('name'), True)
self.register(FileField('file', './scripts/local/tasks'), True)
self.register(corefields.ForeignKeyField('scripts_id', NameServerScripts(connection), 11, False, 'id', 'group', select_fields=[]))
self.register(corefields.IntegerField('position'))

2
settings/config_admin.py
View file

@ -8,4 +8,4 @@ config_admin.append([I18n.lang('pastafari2', 'pastafari_admin', 'Pastafari admin
config_admin.append([I18n.lang('pastafari2', 'settings', 'Settings'), 'modules.pastafari2.admin.dashboard', 'admin_app.pastafari2_settings', 'fa-code'])
config_admin.append([I18n.lang('pastafari2', 'servers', 'Servers'), 'modules.pastafari2.admin.dashboard', 'admin_app.pastafari2_dashboard', 'fa-linux'])
config_admin.append([I18n.lang('pastafari2', 'groups', 'Groups'), 'modules.pastafari2.admin.groups', 'admin_app.pastafari2_groups', 'fa-object-group'])
config_admin.append([I18n.lang('pastafari2', 'tasks', 'Tasks'), 'modules.pastafari2.admin.tasks', 'admin_app.pastafari2_tasks', 'fa-tasks'])
config_admin.append([I18n.lang('pastafari2', 'tasks_log', 'Tasks log'), 'modules.pastafari2.admin.tasks', 'admin_app.pastafari2_tasks', 'fa-tasks'])

1
templates/admin/progress.phtml
View file

@ -17,6 +17,7 @@
</style>
</%block>
<%block name="content">
<h3>${hostname}</h3>
<h2>${lang('pastafari2', 'task progress', 'Task progress')} - ${name_task}</h2>
<p>${description_task}</p>
<hr />