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

Only show authorized servers on role creation

Browse Source
This commit is contained in:
Andrew 2022-06-01 19:26:57 -04:00
parent ec730a1694
commit 273e2f465d
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/classes/controllers/servers_controller.py
View File

@ -349,7 +349,7 @@ class ServersController(metaclass=Singleton):
return False return False
def crash_detection(self, server_obj): def crash_detection(self, server_obj):
svr = self.get_server_obj(server_obj.server_id) svr = self.get_server_instance_by_id(server_obj.server_id)
# start or stop crash detection depending upon user preference # start or stop crash detection depending upon user preference
# The below functions check to see if the server is running. # The below functions check to see if the server is running.
# They only execute if it's running. # They only execute if it's running.

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

@ -1107,8 +1107,14 @@ class PanelHandler(BaseHandler):
"/panel/error?error=Unauthorized access: not a role editor" "/panel/error?error=Unauthorized access: not a role editor"
) )
return return
if exec_user["superuser"]:
page_data["servers_all"] = self.controller.servers.get_all_defined_servers() page_data[
"servers_all"
] = self.controller.servers.get_all_defined_servers()
else:
page_data[
"servers_all"
] = self.controller.servers.get_authorized_servers(exec_user["user_id"])
page_data[ page_data[
"permissions_all" "permissions_all"
] = self.controller.server_perms.list_defined_permissions() ] = self.controller.server_perms.list_defined_permissions()
@ -1120,7 +1126,14 @@ class PanelHandler(BaseHandler):
page_data["new_role"] = False page_data["new_role"] = False
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)
page_data["servers_all"] = self.controller.servers.get_all_defined_servers() if exec_user["superuser"]:
page_data[
"servers_all"
] = self.controller.servers.get_all_defined_servers()
else:
page_data[
"servers_all"
] = self.controller.servers.get_authorized_servers(exec_user["user_id"])
page_data[ page_data[
"permissions_all" "permissions_all"
] = self.controller.server_perms.list_defined_permissions() ] = self.controller.server_perms.list_defined_permissions()