diff --git a/app/classes/controllers/servers_controller.py b/app/classes/controllers/servers_controller.py index fac54db0..c2ed77a9 100644 --- a/app/classes/controllers/servers_controller.py +++ b/app/classes/controllers/servers_controller.py @@ -100,9 +100,7 @@ class Servers_Controller: @staticmethod def get_authorized_servers_stats(user_id): server_data = [] - print('test 1') authorized_servers = Servers_Controller.get_authorized_servers(user_id) - print('test 2') for s in authorized_servers: latest = servers_helper.get_latest_server_stats(s.get('server_id')) @@ -137,11 +135,10 @@ class Servers_Controller: @staticmethod def server_id_authorized(server_id_a, user_id): - print("Server id authorized: ") user_roles = users_helper.user_role_query(user_id) for role in user_roles: for server_id_b in server_permissions.get_role_servers_from_role_id(role.role_id): - if server_id_a == server_id_b: + if str(server_id_a) == str(server_id_b.server_id): return True return False diff --git a/app/classes/models/server_permissions.py b/app/classes/models/server_permissions.py index 165c2b5b..91befc35 100644 --- a/app/classes/models/server_permissions.py +++ b/app/classes/models/server_permissions.py @@ -172,7 +172,7 @@ class Permissions_Servers: if user.superuser: permissions_mask = '1' * len(server_permissions.get_permissions_list()) else: - roles_list = users_helper.get_user_roles_id(user['user_id']) + roles_list = users_helper.get_user_roles_id(user.user_id) role_server = Role_Servers.select().where(Role_Servers.role_id.in_(roles_list)).where(Role_Servers.server_id == server_id).execute() permissions_mask = role_server[0].permissions return permissions_mask diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py index a66ade29..5e02c77e 100644 --- a/app/classes/web/panel_handler.py +++ b/app/classes/web/panel_handler.py @@ -130,7 +130,7 @@ class PanelHandler(BaseHandler): # increasing and will eat up the RAM del chunk - def check_server_id(self) -> Optional[str]: + def check_server_id(self): server_id = self.get_argument('id', None) api_key, _, exec_user = self.current_user