Fixes in flask app
This commit is contained in:
Antonio de la Rosa
parent
25776fd02a
commit
ff9a221ed0
5 changed files with 25 additions and 25 deletions
|
|
@ -1,17 +1,17 @@
|
|||
from flask import Blueprint, g
|
||||
from paramecio2.modules.admin.libraries.admin_auth import admin_prepare, admin_finished
|
||||
|
||||
php_app=Blueprint('php_app', __name__)
|
||||
phpserver_app=Blueprint('phpserver_app', __name__)
|
||||
|
||||
#@admin_app.before_request
|
||||
#def admin_prepare():
|
||||
|
||||
@php_app.before_request
|
||||
@phpserver_app.before_request
|
||||
def admin_prepare_php():
|
||||
|
||||
return admin_prepare()
|
||||
|
||||
@php_app.after_request
|
||||
@phpserver_app.after_request
|
||||
def admin_finished_php(response):
|
||||
|
||||
return admin_finished(response)
|
||||
|
|
|
|||
32
dashboard.py
32
dashboard.py
|
|
@ -1,4 +1,4 @@
|
|||
from modules.phpserver import php_app
|
||||
from modules.phpserver import phpserver_app
|
||||
from settings import config
|
||||
from flask import g, url_for, request, session, make_response, abort
|
||||
from paramecio2.libraries.generate_admin_class import GenerateAdminClass
|
||||
|
|
@ -39,12 +39,12 @@ t.env.directories=admin_t.env.directories
|
|||
t.env.directories.insert(1, os.path.dirname(__file__).replace('/admin', '')+'/templates/admin')
|
||||
t.env.directories.insert(2, '../pastafari2/templates/admin')
|
||||
|
||||
@php_app.route('/phpserver/servers')
|
||||
@phpserver_app.route('/phpserver/servers')
|
||||
def php_dashboard():
|
||||
|
||||
return t.load_template('phpservers.phtml', title=_('PHP Servers'), path_module='php_app.php_dashboard')
|
||||
return t.load_template('phpservers.phtml', title=_('PHP Servers'), path_module='phpserver_app.php_dashboard')
|
||||
|
||||
@php_app.route('/phpserver/get_phpservers', methods=['POST'])
|
||||
@phpserver_app.route('/phpserver/get_phpservers', methods=['POST'])
|
||||
def get_phpservers():
|
||||
|
||||
|
||||
|
|
@ -80,12 +80,12 @@ def options_options(row_id, row):
|
|||
#arr_options=['<a href="{}">{}</a>'.format(url_for('admin_app.virtualhost', dbservermariadb_id=row_id), _('Websites'))]
|
||||
#
|
||||
#arr_options.append('<a href="{}">{}</a>'.format(url_for('admin_app.ports', dbservermariadb_id=row_id), I18n.lang('dbservermariadb', 'http_ports', 'HTTP Ports')))
|
||||
arr_options.append('<a href="{}">{}</a>'.format(url_for('php_app.php_edit_server', php_server_id=row_id), _('Edit')))
|
||||
arr_options.append('<a href="{}">{}</a>'.format(url_for('php_app.delete_php', php_server_id=row_id), _('Delete')))
|
||||
arr_options.append('<a href="{}">{}</a>'.format(url_for('phpserver_app.php_edit_server', php_server_id=row_id), _('Edit')))
|
||||
arr_options.append('<a href="{}">{}</a>'.format(url_for('phpserver_app.delete_php', php_server_id=row_id), _('Delete')))
|
||||
|
||||
return '<br />'.join(arr_options)
|
||||
|
||||
@php_app.route('/phpserver/delete_php/<int:php_server_id>')
|
||||
@phpserver_app.route('/phpserver/delete_php/<int:php_server_id>')
|
||||
def delete_php(php_server_id):
|
||||
|
||||
db=g.connection
|
||||
|
|
@ -99,11 +99,11 @@ def delete_php(php_server_id):
|
|||
with db.query('select count(*) as num_php_vhosts from virtualhost, webserver, serverdbtask, phpserver where virtualhost.webserver_id=webserver.id AND serverdbtask.id=webserver.server_id AND phpserver.server_id=serverdbtask.id AND phpserver.id=%s', [php_server_id]) as cursor:
|
||||
num_php_vhosts=cursor.fetchone()['num_php_vhosts']
|
||||
|
||||
return t.load_template('del_phpserver.phtml', title=_('Remove PHP FPM server'), path_module='php_app.php_dashboard', php_server_id=php_server_id, domain=arr_server['hostname'], num_php_vhosts=num_php_vhosts)
|
||||
return t.load_template('del_phpserver.phtml', title=_('Remove PHP FPM server'), path_module='phpserver_app.php_dashboard', php_server_id=php_server_id, domain=arr_server['hostname'], num_php_vhosts=num_php_vhosts)
|
||||
|
||||
abort(404)
|
||||
|
||||
@php_app.route('/phpserver/delete_php_task/<int:php_server_id>', methods=['POST'])
|
||||
@phpserver_app.route('/phpserver/delete_php_task/<int:php_server_id>', methods=['POST'])
|
||||
def delete_php_task(php_server_id):
|
||||
|
||||
db=g.connection
|
||||
|
|
@ -132,7 +132,7 @@ def delete_php_task(php_server_id):
|
|||
|
||||
#ftp_user=arr_user['user']
|
||||
|
||||
if not sshtask.run_task(arr_server['ip'], 'modules.phpserver.tasks.php.php.delete_php', 'Delete PHP server', 'delete_phpserver', 'Task for delete php-fpm server from server', {'version': arr_server['version'], 'php_server_id': php_server_id}, config_task.remote_user, '', '', url_for('php_app.php_dashboard'), ssh_key_priv=ssh_key_priv, ssh_key_password='', send_task=True, ssh_port=arr_server['ssh_port']):
|
||||
if not sshtask.run_task(arr_server['ip'], 'modules.phpserver.tasks.php.php.delete_php', 'Delete PHP server', 'delete_phpserver', 'Task for delete php-fpm server from server', {'version': arr_server['version'], 'php_server_id': php_server_id}, config_task.remote_user, '', '', url_for('phpserver_app.php_dashboard'), ssh_key_priv=ssh_key_priv, ssh_key_password='', send_task=True, ssh_port=arr_server['ssh_port']):
|
||||
|
||||
error=1
|
||||
|
||||
|
|
@ -143,7 +143,7 @@ def delete_php_task(php_server_id):
|
|||
|
||||
return {'error': error, 'error_form': error_form, 'task_id': task_id}
|
||||
|
||||
@php_app.route('/phpserver/progress/<int:php_server_id>/')
|
||||
@phpserver_app.route('/phpserver/progress/<int:php_server_id>/')
|
||||
def php_progress(php_server_id):
|
||||
|
||||
db=g.connection
|
||||
|
|
@ -151,11 +151,11 @@ def php_progress(php_server_id):
|
|||
#Webservers list >> Web users >> Virtual Hosts
|
||||
#cursor=db.query('select `usersftp`.`id` from `usersftp`')
|
||||
|
||||
return_tree='<p><a href="'+url_for('php_app.php_dashboard')+'">'+_('PHP servers list')+'</a></p>'
|
||||
return_tree='<p><a href="'+url_for('phpserver_app.php_dashboard')+'">'+_('PHP servers list')+'</a></p>'
|
||||
|
||||
return load_progress(db, t, return_tree=return_tree, path_module='php_app.php_dashboard')
|
||||
return load_progress(db, t, return_tree=return_tree, path_module='phpserver_app.php_dashboard')
|
||||
|
||||
@php_app.route('/phpserver/edit_server/<int:php_server_id>/')
|
||||
@phpserver_app.route('/phpserver/edit_server/<int:php_server_id>/')
|
||||
def php_edit_server(php_server_id):
|
||||
|
||||
db=g.connection
|
||||
|
|
@ -166,11 +166,11 @@ def php_edit_server(php_server_id):
|
|||
if arr_server:
|
||||
|
||||
|
||||
return t.load_template('edit_phpserver.phtml', title=_('Edit PHP FPM server'), path_module='php_app.php_dashboard', domain=arr_server['hostname'])
|
||||
return t.load_template('edit_phpserver.phtml', title=_('Edit PHP FPM server'), path_module='phpserver_app.php_dashboard', domain=arr_server['hostname'])
|
||||
|
||||
return {}
|
||||
|
||||
@php_app.route('/phpserver/get_php_server/<int:php_server_id>/')
|
||||
@phpserver_app.route('/phpserver/get_php_server/<int:php_server_id>/')
|
||||
def get_php_server(php_server_id):
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -12,4 +12,4 @@ def php():
|
|||
|
||||
config_admin.append(['PHP'])
|
||||
|
||||
config_admin.append([php(), 'modules.phpserver.dashboard', 'php_app.php_dashboard', '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512" width="24" style="fill: currentColor;display: inline-block;vertical-align: -.130em;position:relative;left:-6px;"><!--!Font Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.--><path d="M320 104.5c171.4 0 303.2 72.2 303.2 151.5S491.3 407.5 320 407.5c-171.4 0-303.2-72.2-303.2-151.5S148.7 104.5 320 104.5m0-16.8C143.3 87.7 0 163 0 256s143.3 168.3 320 168.3S640 349 640 256 496.7 87.7 320 87.7zM218.2 242.5c-7.9 40.5-35.8 36.3-70.1 36.3l13.7-70.6c38 0 63.8-4.1 56.4 34.3zM97.4 350.3h36.7l8.7-44.8c41.1 0 66.6 3 90.2-19.1 26.1-24 32.9-66.7 14.3-88.1-9.7-11.2-25.3-16.7-46.5-16.7h-70.7L97.4 350.3zm185.7-213.6h36.5l-8.7 44.8c31.5 0 60.7-2.3 74.8 10.7 14.8 13.6 7.7 31-8.3 113.1h-37c15.4-79.4 18.3-86 12.7-92-5.4-5.8-17.7-4.6-47.4-4.6l-18.8 96.6h-36.5l32.7-168.6zM505 242.5c-8 41.1-36.7 36.3-70.1 36.3l13.7-70.6c38.2 0 63.8-4.1 56.4 34.3zM384.2 350.3H421l8.7-44.8c43.2 0 67.1 2.5 90.2-19.1 26.1-24 32.9-66.7 14.3-88.1-9.7-11.2-25.3-16.7-46.5-16.7H417l-32.8 168.7z"/></svg>'])
|
||||
config_admin.append([php(), 'modules.phpserver.dashboard', 'phpserver_app.php_dashboard', '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512" width="24" style="fill: currentColor;display: inline-block;vertical-align: -.130em;position:relative;left:-6px;"><!--!Font Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.--><path d="M320 104.5c171.4 0 303.2 72.2 303.2 151.5S491.3 407.5 320 407.5c-171.4 0-303.2-72.2-303.2-151.5S148.7 104.5 320 104.5m0-16.8C143.3 87.7 0 163 0 256s143.3 168.3 320 168.3S640 349 640 256 496.7 87.7 320 87.7zM218.2 242.5c-7.9 40.5-35.8 36.3-70.1 36.3l13.7-70.6c38 0 63.8-4.1 56.4 34.3zM97.4 350.3h36.7l8.7-44.8c41.1 0 66.6 3 90.2-19.1 26.1-24 32.9-66.7 14.3-88.1-9.7-11.2-25.3-16.7-46.5-16.7h-70.7L97.4 350.3zm185.7-213.6h36.5l-8.7 44.8c31.5 0 60.7-2.3 74.8 10.7 14.8 13.6 7.7 31-8.3 113.1h-37c15.4-79.4 18.3-86 12.7-92-5.4-5.8-17.7-4.6-47.4-4.6l-18.8 96.6h-36.5l32.7-168.6zM505 242.5c-8 41.1-36.7 36.3-70.1 36.3l13.7-70.6c38.2 0 63.8-4.1 56.4 34.3zM384.2 350.3H421l8.7-44.8c43.2 0 67.1 2.5 90.2-19.1 26.1-24 32.9-66.7 14.3-88.1-9.7-11.2-25.3-16.7-46.5-16.7H417l-32.8 168.7z"/></svg>'])
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<%inherit file="dashboard.phtml"/>
|
||||
<%block name="content">
|
||||
<p><a href="${url_for('php_app.php_dashboard')}">${_('PHP servers list')}</a> >> ${_('Delete php server')}</p>
|
||||
<p><a href="${url_for('phpserver_app.php_dashboard')}">${_('PHP servers list')}</a> >> ${_('Delete php server')}</p>
|
||||
<form method="post" name="del_phpserver" id="del_phpserver">
|
||||
<input type="hidden" name="php_server_id" value="${php_server_id}" />
|
||||
<h3>${domain}</h3>
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
% endif
|
||||
</form>
|
||||
<p><a href="${url_for('php_app.php_dashboard')}">${_('PHP servers list')}</a> >> ${_('Delete php server')}</p>
|
||||
<p><a href="${url_for('phpserver_app.php_dashboard')}">${_('PHP servers list')}</a> >> ${_('Delete php server')}</p>
|
||||
</%block>
|
||||
<%block name="jscript_block">
|
||||
<script language="Javascript" src="${make_media_url('js/jsutils/posting2.js', 'pastafari2')}"></script>
|
||||
|
|
@ -21,9 +21,9 @@
|
|||
|
||||
/* options: url: url to post, loading: dom id, success: func, pre_callback, separated_data:boolean, upload: {progressbar: '#progressbar', 'total_loader': '#total_loader', 'status': '#status'} */
|
||||
|
||||
options={'url': '${url_for("php_app.delete_php_task", php_server_id=php_server_id)}', 'loading': '#layer_loading', 'success': function (data) {
|
||||
options={'url': '${url_for("phpserver_app.delete_php_task", php_server_id=php_server_id)}', 'loading': '#layer_loading', 'success': function (data) {
|
||||
|
||||
location.href="${url_for('php_app.php_progress', php_server_id=php_server_id)}?task_id="+data.task_id;
|
||||
location.href="${url_for('phpserver_app.php_progress', php_server_id=php_server_id)}?task_id="+data.task_id;
|
||||
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<script language="Javascript" src="${make_media_url('js/jsutils/ajax_list.js', 'pastafari2')}"></script>
|
||||
<script>
|
||||
|
||||
options={'url': "${url_for('php_app.get_phpservers')}", extra_data: {}};
|
||||
options={'url': "${url_for('phpserver_app.get_phpservers')}", extra_data: {}};
|
||||
|
||||
alist=$('#table_servers').ajaxList('table_list', options);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue