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

Made it so server is added to all user roles when created.

Browse Source
This commit is contained in:
Andrew 2021-08-21 10:30:37 -04:00
parent 89f6a98dc9
commit 1150c98faf
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/classes/shared/models.py
View File

@ -318,7 +318,6 @@ class db_shortcuts:
def get_all_authorized_servers(user_id):
user_servers = User_Servers.select().where(User_Servers.user_id == user_id)
user_roles = User_Roles.select().where(User_Roles.user_id == user_id)
server_data = []
roles_list = []
role_server = []
server_data = []
@ -416,6 +415,13 @@ class db_shortcuts:
roles_list.append(db_helper.get_role(r.role_id)['role_name'])
return roles_list
@staticmethod
def get_user_roles_id(user_id):
roles_list = []
roles = User_Roles.select().where(User_Roles.user_id == user_id)
for r in roles:
roles_list.append(db_helper.get_role(r.role_id)['role_id'])
return roles_list
@staticmethod
def get_authorized_servers_stats_from_roles(user_id):
@ -553,8 +559,8 @@ class db_shortcuts:
return user
@staticmethod
def add_user_server(server_id, user_id):
servers = User_Servers.insert({User_Servers.server_id: server_id, User_Servers.user_id: user_id}).execute()
def add_role_server(server_id, role_id):
servers = Role_Servers.insert({Role_Servers.server_id: server_id, Role_Servers.role_id: role_id}).execute()
return servers

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

@ -195,8 +195,10 @@ class ServerHandler(BaseHandler):
return
server_type, server_version = server_parts
# todo: add server type check here and call the correct server add functions if not a jar
role_ids = db_helper.get_user_roles_id(exec_user_id)
new_server_id = self.controller.create_jar_server(server_type, server_version, server_name, min_mem, max_mem, port)
db_helper.add_user_server(new_server_id, exec_user_id)
for role in role_ids:
db_helper.add_role_server(new_server_id, role)
db_helper.add_to_audit_log(exec_user_data['user_id'],
"created a {} {} server named \"{}\"".format(server_version, str(server_type).capitalize(), server_name), # Example: Admin created a 1.16.5 Bukkit server named "survival"
new_server_id,