From aff9bad48323d9ce5f266ab309c48183c4832ea9 Mon Sep 17 00:00:00 2001 From: Antonio de la Rosa Date: Sat, 25 Oct 2025 23:41:47 +0200 Subject: [PATCH] FIxes in nav urls --- admin/app.py | 4 ++-- admin/install_apps.py | 8 ++++---- libraries/webapptask.py | 4 ++-- templates/admin/add_webapp.phtml | 6 +++--- templates/admin/edit_virtualhost.phtml | 4 ++-- templates/admin/virtualhosts.phtml | 4 ++-- templates/admin/webapps.phtml | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/admin/app.py b/admin/app.py index 8d44b3e..30d29be 100644 --- a/admin/app.py +++ b/admin/app.py @@ -650,7 +650,7 @@ def edit_virtualhost(virtualhost_id): virtual=VirtualHost(db) #arr_vhost=virtual.select_a_row(virtualhost_id, [], True) - with virtual.query('select virtualhost.*, webserver.id, serverdbtask.distro, serverdbtask.id from virtualhost, webserver, serverdbtask WHERE virtualhost.id=%s AND virtualhost.webserver_id=webserver.id AND webserver.server_id=serverdbtask.id', [virtualhost_id]) as cursor: + with virtual.query('select virtualhost.*, webserver.id, serverdbtask.distro, serverdbtask.id, serverdbtask.hostname from virtualhost, webserver, serverdbtask WHERE virtualhost.id=%s AND virtualhost.webserver_id=webserver.id AND webserver.server_id=serverdbtask.id', [virtualhost_id]) as cursor: arr_vhost=cursor.fetchone() @@ -748,7 +748,7 @@ def edit_virtualhost(virtualhost_id): form=show_form(arr_vhost, arr_form, t, yes_error=True, pass_values=True, modelform_tpl='forms/modelform.phtml') - return t.load_template('edit_virtualhost.phtml', title=_('Edit Virtual Host'), path_module='admin_app.webservers', form=form, webserver_id=arr_vhost['webserver_id'], virtualhost_id=virtualhost_id) + return t.load_template('edit_virtualhost.phtml', title=_('Edit Virtual Host'), path_module='admin_app.webservers', form=form, webserver_id=arr_vhost['webserver_id'], hostname=arr_vhost['hostname'], virtualhost_id=virtualhost_id) pass diff --git a/admin/install_apps.py b/admin/install_apps.py index a520e2d..a6166b4 100644 --- a/admin/install_apps.py +++ b/admin/install_apps.py @@ -58,13 +58,13 @@ def webapps(virtualhost_id): if arr_vhost: - with db.query('select serverdbtask.id from serverdbtask, webserver WHERE webserver.id=%s AND serverdbtask.id=webserver.server_id', [arr_vhost['webserver_id']]) as cursor: + with db.query('select serverdbtask.id, serverdbtask.hostname from serverdbtask, webserver WHERE webserver.id=%s AND serverdbtask.id=webserver.server_id', [arr_vhost['webserver_id']]) as cursor: arr_server=cursor.fetchone() pass - return t.load_template('webapps.phtml', title=_('Webapps'), path_module='admin_app.webservers', domain=arr_vhost['domain'], webserver_id=arr_vhost['webserver_id'], virtualhost_id=virtualhost_id, server_id=arr_server['id']) + return t.load_template('webapps.phtml', title=_('Webapps'), path_module='admin_app.webservers', domain=arr_vhost['domain'], webserver_id=arr_vhost['webserver_id'], virtualhost_id=virtualhost_id, server_id=arr_server['id'], hostname=arr_server['hostname']) return {} @@ -130,10 +130,10 @@ def add_new_app(virtualhost_id): if arr_vhost: #arr_server=serverdb.set_conditions('WHERE id=%s', [arr_vhost - with vhost.query('select serverdbtask.id as server_id, serverdbtask.ip, webserver.id from serverdbtask, webserver WHERE webserver.id=%s AND webserver.server_id=serverdbtask.id', [arr_vhost['webserver_id']]) as cursor: + with vhost.query('select serverdbtask.id as server_id, serverdbtask.ip, serverdbtask.hostname, webserver.id from serverdbtask, webserver WHERE webserver.id=%s AND webserver.server_id=serverdbtask.id', [arr_vhost['webserver_id']]) as cursor: arr_server=cursor.fetchone() - return t.load_template('add_webapp.phtml', title=_('Add webapp'), path_module='admin_app.webservers', domain=arr_vhost['domain'], webserver_id=arr_vhost['webserver_id'], virtualhost_id=virtualhost_id, scripts_lists=scripts_lists, server_id=arr_server['server_id']) + return t.load_template('add_webapp.phtml', title=_('Add webapp'), path_module='admin_app.webservers', domain=arr_vhost['domain'], webserver_id=arr_vhost['webserver_id'], virtualhost_id=virtualhost_id, scripts_lists=scripts_lists, server_id=arr_server['server_id'], hostname=arr_server['hostname']) return {} diff --git a/libraries/webapptask.py b/libraries/webapptask.py index 7dda364..8903cb7 100644 --- a/libraries/webapptask.py +++ b/libraries/webapptask.py @@ -14,7 +14,7 @@ class WebAppTask(Task): webserver_id=0 - with self.connection.query('select webserver_id from virtualhost WHERE id=%s', [self.data['virtualhost_id']]) as cursor: + with self.connection.query('select virtualhost.webserver_id, webserver.id, serverdbtask.hostname from virtualhost, webserver, serverdbtask WHERE virtualhost.id=%s AND virtualhost.webserver_id=webserver.id AND webserver.server_id=serverdbtask.id', [self.data['virtualhost_id']]) as cursor: arr_vhost=cursor.fetchone() @@ -25,7 +25,7 @@ class WebAppTask(Task): #

Webservers list >> Websites >> Webapps >> Add webapp

- self.links='

{} >> {} >> {} >> {}

'.format(make_url('webservers/servers'), I18n.lang('webservers', 'webservers_list', 'Webservers list'), make_url('webservers/virtualhost/'+str(webserver_id)), I18n.lang('webservers', 'websites', 'Websites'), make_url('webapps/'+str(self.data['virtualhost_id'])), I18n.lang('webservers', 'webapps', 'Webapps'), make_url('add_new_app/'+str(self.data['virtualhost_id'])), I18n.lang('webservers', 'add_webapp', 'Add webapp')) + self.links='

{} >> {} >> {} >> {}

'.format(make_url('webservers/servers'), I18n.lang('webservers', 'webservers_list', 'Webservers list'), make_url('webservers/virtualhost/'+str(webserver_id)), I18n.lang('webservers', 'websites', 'Websites')+' - '+arr_vhost['hostname'], make_url('webapps/'+str(self.data['virtualhost_id'])), I18n.lang('webservers', 'webapps', 'Webapps'), make_url('add_new_app/'+str(self.data['virtualhost_id'])), I18n.lang('webservers', 'add_webapp', 'Add webapp')) self.delete_task=False diff --git a/templates/admin/add_webapp.phtml b/templates/admin/add_webapp.phtml index bfb8dde..230fa5b 100644 --- a/templates/admin/add_webapp.phtml +++ b/templates/admin/add_webapp.phtml @@ -8,10 +8,10 @@ ids=json.dumps([server_id]) %>

${domain}

-

${lang('webservers', 'webservers_list', 'Webservers list')} >> ${lang('webservers', 'websites', 'Websites')} >> ${lang('webservers', 'webapps', 'Webapps')} >> ${lang('webservers', 'add_webapp', 'Add webapp')}

+

${lang('webservers', 'webservers_list', 'Webservers list')} >> ${_('Websites')} - ${hostname} >> ${_('Webapps')} >> ${_('Add webapp')}

-

+

-

${lang('webservers', 'webservers_list', 'Webservers list')} >> ${lang('webservers', 'websites', 'Websites')} >> ${lang('webservers', 'webapps', 'Webapps')} >> ${lang('webservers', 'add_webapp', 'Add webapp')}

+

${lang('webservers', 'webservers_list', 'Webservers list')} >> ${_('Websites')} - ${hostname} >> ${_('Webapps')} >> ${_('Add webapp')}

<%block name="jscript_block"> diff --git a/templates/admin/edit_virtualhost.phtml b/templates/admin/edit_virtualhost.phtml index 6541d1c..5c70988 100644 --- a/templates/admin/edit_virtualhost.phtml +++ b/templates/admin/edit_virtualhost.phtml @@ -2,7 +2,7 @@ <%block name="extra_css"> <%block name="content"> -

${lang('webservers', 'webservers_list', 'Webservers list')} >> ${lang('webservers', 'websites', 'Websites')} >> ${lang('webservers', 'edit_website', 'Edit website')}

+

${_('Webservers list')} >> ${_('Websites')} - ${hostname} >> ${_('Edit website')}

${form|n}

-

${lang('webservers', 'webservers_list', 'Webservers list')} >> ${lang('webservers', 'websites', 'Websites')} >> ${lang('webservers', 'edit_website', 'Edit website')}

+

${_('Webservers list')} >> ${_('Websites')} - ${hostname} >> ${_( 'Edit website')}

<%block name="jscript_block"> diff --git a/templates/admin/virtualhosts.phtml b/templates/admin/virtualhosts.phtml index 8223a9e..6480853 100644 --- a/templates/admin/virtualhosts.phtml +++ b/templates/admin/virtualhosts.phtml @@ -15,11 +15,11 @@ % endfor

-

${_('Webservers list')} >> ${hostname} >> ${_('Websites')}

+

${_('Webservers list')} >> ${_('Websites')}

${_('Add new website')}

-

${_('Webservers list')} >> ${hostname} >> ${_('Websites')}

+

${_('Webservers list')} >> ${_('Websites')}