Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Declutter set()s

Browse Source
This commit is contained in:
luukas 2022-05-16 00:55:22 +03:00
parent 39a5b89b92
commit 27d310e2de
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/classes/controllers/roles_controller.py
View File

@ -75,9 +75,7 @@ class RolesController:
if role:
servers_query = PermissionsServers.get_servers_from_role(role_id)
# TODO: this query needs to be narrower
servers = set()
for s in servers_query:
servers.add(s.server_id.server_id)
servers = {s.server_id.server_id for s in servers_query}
role["servers"] = servers
# logger.debug("role: ({}) {}".format(role_id, role))
return role

4
app/classes/models/users.py
View File

@ -299,9 +299,7 @@ class HelperUsers:
.where(UserRoles.user_id == user_id)
)
# TODO: this query needs to be narrower
roles = set()
for r in roles_query:
roles.add(r.role_id.role_id)
roles = {r.role_id.role_id for r in roles_query}
if isinstance(user, dict):
user["roles"] = roles

11
app/classes/web/panel_handler.py
View File

@ -210,10 +210,9 @@ class PanelHandler(BaseHandler):
if api_key is not None:
superuser = superuser and api_key.superuser
exec_user_role = set()
if superuser: # TODO: Figure out a better solution
defined_servers = self.controller.list_defined_servers()
exec_user_role.add("Super User")
exec_user_role = {"Super User"}
exec_user_crafty_permissions = (
self.controller.crafty_perms.list_defined_crafty_permissions()
)
@ -229,6 +228,7 @@ class PanelHandler(BaseHandler):
)
)
logger.debug(exec_user["roles"])
exec_user_role = set()
for r in exec_user["roles"]:
role = self.controller.roles.get_role(r)
exec_user_role.add(role["role_name"])
@ -946,12 +946,11 @@ class PanelHandler(BaseHandler):
user_id = self.get_argument("id", None)
role_servers = self.controller.servers.get_authorized_servers(user_id)
page_role_servers = []
servers = set()
for server in role_servers:
page_role_servers.append(server["server_id"])
page_data["new_user"] = False
page_data["user"] = self.controller.users.get_user_by_id(user_id)
page_data["servers"] = servers
page_data["servers"] = set()
page_data["role-servers"] = page_role_servers
page_data["roles_all"] = self.controller.roles.get_all_roles()
page_data["servers_all"] = self.controller.list_defined_servers()
@ -1239,10 +1238,9 @@ class PanelHandler(BaseHandler):
"Config": EnumPermissionsServer.CONFIG,
"Players": EnumPermissionsServer.PLAYERS,
}
exec_user_role = set()
if superuser:
# defined_servers = self.controller.list_defined_servers()
exec_user_role.add("Super User")
exec_user_role = {"Super User"}
exec_user_crafty_permissions = (
self.controller.crafty_perms.list_defined_crafty_permissions()
)
@ -1254,6 +1252,7 @@ class PanelHandler(BaseHandler):
)
# defined_servers =
# self.controller.servers.get_authorized_servers(exec_user["user_id"])
exec_user_role = set()
for r in exec_user["roles"]:
role = self.controller.roles.get_role(r)
exec_user_role.add(role["role_name"])

4
app/classes/web/server_handler.py
View File

@ -27,10 +27,9 @@ class ServerHandler(BaseHandler):
if api_key is not None:
superuser = superuser and api_key.superuser
exec_user_role = set()
if superuser:
defined_servers = self.controller.list_defined_servers()
exec_user_role.add("Super User")
exec_user_role = {"Super User"}
exec_user_crafty_permissions = (
self.controller.crafty_perms.list_defined_crafty_permissions()
)
@ -47,6 +46,7 @@ class ServerHandler(BaseHandler):
exec_user["user_id"]
)
list_roles = []
exec_user_role = set()
for r in exec_user["roles"]:
role = self.controller.roles.get_role(r)
exec_user_role.add(role["role_name"])