NussNougate/crafty-4
2
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2025-01-19 09:45:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix servers being out of order on creation page.

Browse Source
This commit is contained in:
amcmanu3 2022-07-18 17:12:43 -04:00
parent 4cd0301d5f
commit 383194cf66
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,8 +36,6 @@ class PanelHandler(BaseHandler):
user_roles = {} user_roles = {}
for user_id in self.controller.users.get_all_user_ids(): for user_id in self.controller.users.get_all_user_ids():
user_roles_list = self.controller.users.get_user_roles_names(user_id) user_roles_list = self.controller.users.get_user_roles_names(user_id)
# user_servers =
# self.controller.servers.get_authorized_servers(user.user_id)
user_roles[user_id] = user_roles_list user_roles[user_id] = user_roles_list
return user_roles return user_roles

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

@ -62,12 +62,31 @@ class ServerHandler(BaseHandler):
exec_user_role.add(role["role_name"]) exec_user_role.add(role["role_name"])
list_roles.append(self.controller.roles.get_role(role["role_id"])) list_roles.append(self.controller.roles.get_role(role["role_id"]))
user_order = self.controller.users.get_user_by_id(exec_user["user_id"])
user_order = user_order["server_order"].split(",")
page_servers = [] page_servers = []
server_ids = []
for server_id in user_order[:]:
for server in defined_servers[:]:
if str(server.server_id) == str(server_id):
page_servers.append(
DatabaseShortcuts.get_data_obj(server.server_object)
)
user_order.remove(server_id)
defined_servers.remove(server)
for server in defined_servers: for server in defined_servers:
server_ids.append(str(server.server_id))
if server not in page_servers: if server not in page_servers:
page_servers.append( page_servers.append(
DatabaseShortcuts.get_data_obj(server.server_object) DatabaseShortcuts.get_data_obj(server.server_object)
) )
for server_id in user_order[:]:
# remove IDs in list that user no longer has access to
if str(server_id) not in server_ids:
user_order.remove(server_id)
defined_servers = page_servers defined_servers = page_servers
template = "public/404.html" template = "public/404.html"
@ -92,7 +111,7 @@ class ServerHandler(BaseHandler):
), ),
}, },
"hosts_data": self.controller.management.get_latest_hosts_stats(), "hosts_data": self.controller.management.get_latest_hosts_stats(),
"menu_servers": defined_servers, "menu_servers": page_servers,
"show_contribute": self.helper.get_setting("show_contribute_link", True), "show_contribute": self.helper.get_setting("show_contribute_link", True),
"lang": self.controller.users.get_user_lang_by_id(exec_user["user_id"]), "lang": self.controller.users.get_user_lang_by_id(exec_user["user_id"]),
"lang_page": Helpers.get_lang_page( "lang_page": Helpers.get_lang_page(