diff --git a/admin/dashboard.py b/admin/dashboard.py index a95533c..1e8af4a 100644 --- a/admin/dashboard.py +++ b/admin/dashboard.py @@ -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']) diff --git a/admin/tasks.py b/admin/tasks.py index a6ce733..e138d79 100644 --- a/admin/tasks.py +++ b/admin/tasks.py @@ -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 diff --git a/models/pastafari2.py b/models/pastafari2.py index a98ee34..6865aae 100644 --- a/models/pastafari2.py +++ b/models/pastafari2.py @@ -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')) diff --git a/settings/config_admin.py b/settings/config_admin.py index 0b0f918..25f7d7f 100644 --- a/settings/config_admin.py +++ b/settings/config_admin.py @@ -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']) diff --git a/templates/admin/progress.phtml b/templates/admin/progress.phtml index 907eb54..69efa54 100644 --- a/templates/admin/progress.phtml +++ b/templates/admin/progress.phtml @@ -17,6 +17,7 @@ %block> <%block name="content"> +
${description_task}