v5.5.0.0

Changelog: https://roxy-wi.org/changelog.py#5_5_0

app/add.py

@@ -22,7 +22,7 @@ if (
 		form.getvalue('generateconfig') is None
 	):
 	try:
-		user, user_id, role, token, servers, user_services = funct.get_users_params()
+		user, user_id, role, token, servers, user_services = funct.get_users_params(haproxy=1)
 		cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE"))
 		group = cookie.get('group')
 		user_group = group.value

app/config.py

@@ -47,7 +47,7 @@ else:
 		action = "config.py"
 		configs_dir = funct.get_config_var('configs', 'haproxy_save_configs_dir')
 		file_format = 'cfg'
-		servers = sql.get_dick_permit()
+		servers = sql.get_dick_permit(haproxy=1)
 
 if serv is not None:
 	if service == 'nginx':

app/funct.py

@@ -1538,10 +1538,14 @@ def get_users_params(**kwargs):
 		role = ''
 		user_services = ''
 		token = ''
-	if kwargs.get('virt'):
+	if kwargs.get('virt') and kwargs.get('haproxy'):
+		servers = sql.get_dick_permit(virt=1, haproxy=1)
+	elif kwargs.get('virt'):
 		servers = sql.get_dick_permit(virt=1)
 	elif kwargs.get('disable'):
 		servers = sql.get_dick_permit(disable=0)
+	elif kwargs.get('haproxy'):
+		servers = sql.get_dick_permit(haproxy=1)
 	else:
 		servers = sql.get_dick_permit()
 

app/runtimeapi.py

@@ -9,7 +9,7 @@ funct.check_login(service=1)
 form = funct.form
 
 try:
-	user, user_id, role, token, servers, user_services = funct.get_users_params(virt=1)
+	user, user_id, role, token, servers, user_services = funct.get_users_params(virt=1, haproxy=1)
 	servbackend = form.getvalue('servbackend')
 	serv = form.getvalue('serv')
 	if servbackend is None:

app/versions.py

@@ -47,6 +47,7 @@ else:
 	if funct.check_login(service=1):
 		title = "Working with versions HAProxy configs"
 		configs_dir = funct.get_config_var('configs', 'haproxy_save_configs_dir')
+		servers = sql.get_dick_permit(haproxy=1)
 		action = "versions.py"
 
 if serv is not None and form.getvalue('del') is not None:

app/viewsttats.py

@@ -18,7 +18,7 @@ else:
 		title = 'HAProxy stats page'
 
 try:
-	user, user_id, role, token, servers, user_services = funct.get_users_params(virt=1)
+	user, user_id, role, token, servers, user_services = funct.get_users_params(virt=1, haproxy=1)
 	
 	if serv is None:
 		first_serv = servers