From 83f95ffcb456eb8e68b6282d29a7014429c2bef9 Mon Sep 17 00:00:00 2001 From: Antonio de la Rosa Date: Fri, 11 Feb 2022 20:32:21 +0100 Subject: [PATCH] Added delete server support --- admin/dashboard.py | 43 +++++++++++++++++++++++------ templates/admin/delete_server.phtml | 30 ++++++++++++++++++++ 2 files changed, 65 insertions(+), 8 deletions(-) create mode 100644 templates/admin/delete_server.phtml diff --git a/admin/dashboard.py b/admin/dashboard.py index c0d2d4c..75c514c 100644 --- a/admin/dashboard.py +++ b/admin/dashboard.py @@ -15,7 +15,7 @@ from paramecio2.libraries.formsutils import show_form from modules.pastafari2.libraries.task import Task as SSHTask from modules.pastafari2.models.tasks import Task, LogTask from modules.pastafari2.libraries.configtask import config_task -from modules.pastafari2.models.pastafari2 import ServerGroup +from modules.pastafari2.models.pastafari2 import ServerGroup, ServerDbTask from pathlib import Path import paramiko import socket @@ -408,7 +408,7 @@ def options_options(row_id, row): arr_options=['{}'.format("", I18n.lang('pastafari2', 'edit', 'Edit'))] #arr_options.append('{}'.format("", I18n.lang('pastafari2', 'make_task', 'Make task'))) - arr_options.append('{}'.format("", I18n.lang('pastafari2', 'delete', 'Delete'))) + arr_options.append('{}'.format(url_for('admin_app.pastafari2_delete_server', server_id=row_id), I18n.lang('pastafari2', 'delete', 'Delete'))) return '
'.join(arr_options) @@ -529,11 +529,7 @@ def pastafari2_get_multiprogress(): final_ids=[str(i) for i in json.loads(ids)] final_str=",".join(['%s']*len(final_ids)) - - #print(final_str) - #for i in final_ids: - - + task=Task(db) logtask=LogTask(db) @@ -549,5 +545,36 @@ def pastafari2_get_multiprogress(): @admin_app.route('/pastafari2/delete_server/') def pastafari2_delete_server(): - return t.load_template('delete_server.phtml', title=I18n.lang('pastafari2', 'delete_server', 'Delete server'), path_module='admin_app.pastafari2_dashboard') + db=g.connection + + server=ServerDbTask(db) + + server_id=request.args.get('server_id', '0') + + arr_server=server.select_a_row(server_id) + + if arr_server: + + return t.load_template('delete_server.phtml', title=I18n.lang('pastafari2', 'delete_server', 'Delete server'), path_module='admin_app.pastafari2_dashboard', server_id=server_id, server=arr_server) + + else: + + return "" + +@admin_app.route('/pastafari2/delete_server_db/', methods=['POST']) +def pastafari2_delete_server_db(): + + db=g.connection + + error=0 + + server=ServerDbTask(db) + + server_id=request.form.get('server_id', '0') + + server.set_conditions('WHERE id=%s', [server_id]).delete() + + return {'error': error} + + diff --git a/templates/admin/delete_server.phtml b/templates/admin/delete_server.phtml new file mode 100644 index 0000000..a06b831 --- /dev/null +++ b/templates/admin/delete_server.phtml @@ -0,0 +1,30 @@ +<%inherit file="dashboard.phtml"/> +<%block name="content"> +

${lang('pastafari2', 'servers', 'Servers')} >> ${lang('pastafari2', 'delete_server', 'Delete server')}

+
+
+

${server['hostname']}

+ +

+
+
+

${lang('pastafari2', 'servers', 'Servers')} >> ${lang('pastafari2', 'delete_server', 'Delete server')}

+ +<%block name="jscript_block"> + + +