diff --git a/app/options.py b/app/options.py index 28807db1..2acc94c4 100644 --- a/app/options.py +++ b/app/options.py @@ -4338,7 +4338,7 @@ if act == 'showListOfVersion': service_desc = sql.select_service(service) if service in ('haproxy', 'nginx', 'keepalived', 'apache'): - configs = sql.select_config_version(serv, service_desc.service) + configs = sql.select_config_version(serv, service_desc.slug) action = f'versions.py?service={service_desc.slug}' if service in ('haproxy', 'nginx', 'apache'): diff --git a/inc/script.js b/inc/script.js index a5054f7c..8227601a 100644 --- a/inc/script.js +++ b/inc/script.js @@ -309,25 +309,15 @@ function showStats() { } function openStats() { var serv = $("#serv").val(); - if (cur_url[1].split('&')[0] == "service=nginx") { - var url = "statsview.py?service=nginx&serv="+serv+"&open=open" - } else { - var url = "statsview.py?serv="+serv+"&open=open" - } + var service_url = cur_url[1].split('&')[0]; + var url = "statsview.py?"+service_url+"&serv="+serv+"&open=open" var win = window.open(url, '_blank'); win.focus(); } function openVersions() { var serv = $("#serv").val(); - if (cur_url[1].split('&')[0] == "service=keepalived") { - var url = "versions.py?service=keepalived&serv="+serv+"&open=open" - } else if (cur_url[1].split('&')[0] == "service=nginx") { - var url = "versions.py?service=nginx&serv="+serv+"&open=open" - } else if (cur_url[1].split('&')[0] == "service=apache") { - var url = "versions.py?service=apache&serv="+serv+"&open=open" - } else { - var url = "versions.py?serv="+serv+"&open=open" - } + var service_url = cur_url[1].split('&')[0]; + var url = "versions.py?"+service_url+"&serv="+serv+"&open=open" var win = window.open(url,"_self"); win.focus(); }