v7.0.0.0

Changelog: https://roxy-wi.org/changelog#7.0.0

app/modules/roxywi/user.py

@@ -1,6 +1,6 @@
 import os
 
-from flask import render_template, request, make_response
+from flask import render_template, make_response
 
 import modules.db.sql as sql
 import modules.roxywi.common as roxywi_common

app/routes/metric/routes.py

@@ -29,7 +29,7 @@ def metrics(service):
     service_desc = sql.select_service(service)
     roxywi_common.check_user_group_for_flask()
     servers = ''
-
+    services = '0'
     is_redirect = roxywi_auth.check_login(user_params['user_uuid'], user_params['token'], service=service_desc.service_id)
 
     if is_redirect != 'ok':
@@ -41,10 +41,10 @@ def metrics(service):
         else:
             cmd = "rpm -q roxy-wi-metrics-* |awk -F\"metrics\" '{print $2}' |awk -F\".noa\" '{print $1}' |sed 's/-//1' |sed 's/-/./'"
         service_ver, stderr = server_mod.subprocess_execute(cmd)
-        services = '0'
+
         if not stderr:
             if len(service_ver) > 0:
-                if service_ver[0] == ' is not installed':
+                if 'is not installed' in service_ver[0]:
                     servers = ''
                 else:
                     services = '1'

app/templates/ajax/stick_table.html

@@ -70,6 +70,11 @@
 					</th>
 					{% endif %}
 					{% if headers|length > 8 %}
+					<th>
+						{{headers.8.split('=')[0].split('(')[0]}}
+					</th>
+					{% endif %}
+					{% if headers|length > 9 %}
 					<th>
 						{{headers.9.split('=')[0].split('(')[0]}}
 					</th>

app/templates/ajax/stick_tables.html

@@ -68,6 +68,11 @@
 						</th>
 						{% endif %}
 						{% if headers|length > 8 %}
+						<th>
+							{{headers.8.split('=')[0].split('(')[0]}}
+						</th>
+						{% endif %}
+						{% if headers|length > 9 %}
 						<th>
 							{{headers.9.split('=')[0].split('(')[0]}}
 						</th>

inc/users.js

@@ -3041,6 +3041,12 @@ function saveGroupsAndRoles(user_id) {
 		var role_id = $('#add_role-' + this_id).val();
 		jsonData[user_id][this_id] = {'role_id': role_id};
 	});
+	for (const [key, value] of Object.entries(jsonData)) {
+		if (Object.keys(value).length === 0) {
+			toastr.error('error: User must have at least one group');
+			return false;
+		}
+	}
 	$.ajax({
 		url: "/app/user/groups/save",
 		data: {