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

Redefine how servers are served to panel_handler

Browse Source
This commit is contained in:
Andrew 2022-06-02 07:34:17 -04:00
parent f2dec0c52b
commit b793016c03
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1108,13 +1108,18 @@ class PanelHandler(BaseHandler):
) )
return return
if exec_user["superuser"]: if exec_user["superuser"]:
page_data[ defined_servers = self.controller.servers.list_defined_servers()
"servers_all"
] = self.controller.servers.get_all_defined_servers()
else: else:
page_data[ defined_servers = self.controller.servers.get_authorized_servers(
"servers_all" exec_user["user_id"]
] = self.controller.servers.get_authorized_servers(exec_user["user_id"]) )
page_servers = []
for server in defined_servers:
if server not in page_servers:
page_servers.append(
DatabaseShortcuts.get_data_obj(server.server_object)
)
page_data["servers_all"] = page_servers
page_data[ page_data[
"permissions_all" "permissions_all"
] = self.controller.server_perms.list_defined_permissions() ] = self.controller.server_perms.list_defined_permissions()
@ -1127,13 +1132,18 @@ class PanelHandler(BaseHandler):
role_id = self.get_argument("id", None) role_id = self.get_argument("id", None)
page_data["role"] = self.controller.roles.get_role_with_servers(role_id) page_data["role"] = self.controller.roles.get_role_with_servers(role_id)
if exec_user["superuser"]: if exec_user["superuser"]:
page_data[ defined_servers = self.controller.servers.list_defined_servers()
"servers_all"
] = self.controller.servers.get_all_defined_servers()
else: else:
page_data[ defined_servers = self.controller.servers.get_authorized_servers(
"servers_all" exec_user["user_id"]
] = self.controller.servers.get_authorized_servers(exec_user["user_id"]) )
page_servers = []
for server in defined_servers:
if server not in page_servers:
page_servers.append(
DatabaseShortcuts.get_data_obj(server.server_object)
)
page_data["servers_all"] = page_servers
page_data[ page_data[
"permissions_all" "permissions_all"
] = self.controller.server_perms.list_defined_permissions() ] = self.controller.server_perms.list_defined_permissions()