From 6984fe7abcd68c807e483055eca6c5b2af99478f Mon Sep 17 00:00:00 2001 From: Silversthorn Date: Sat, 9 Oct 2021 10:59:54 +0200 Subject: [PATCH] Corrections on server creation --- .../controllers/crafty_perms_controller.py | 15 +++++++++------ app/classes/web/server_handler.py | 9 +++++---- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/app/classes/controllers/crafty_perms_controller.py b/app/classes/controllers/crafty_perms_controller.py index 31526c77..f9f95f0d 100644 --- a/app/classes/controllers/crafty_perms_controller.py +++ b/app/classes/controllers/crafty_perms_controller.py @@ -27,20 +27,20 @@ class Crafty_Perms_Controller: def list_defined_crafty_permissions(): permissions_list = crafty_permissions.get_permissions_list() return permissions_list - + @staticmethod def get_mask_crafty_permissions(user_id): permissions_mask = crafty_permissions.get_crafty_permissions_mask(user_id) return permissions_mask - + @staticmethod def set_permission(permission_mask, permission_tested: Enum_Permissions_Crafty, value): return crafty_permissions.set_permission(permission_mask, permission_tested, value) - + @staticmethod def can_create_server(user_id): return crafty_permissions.can_add_in_crafty(user_id, Enum_Permissions_Crafty.Server_Creation) - + @staticmethod def can_add_user(user_id): #TODO: Complete if we need a User Addition limit @@ -60,10 +60,13 @@ class Crafty_Perms_Controller: @staticmethod def list_crafty_permissions_quantity_limits(user_id): return crafty_permissions.get_permission_quantity_list(user_id) - + @staticmethod def get_crafty_permissions_list(user_id): permissions_mask = crafty_permissions.get_crafty_permissions_mask(user_id) permissions_list = crafty_permissions.get_permissions(permissions_mask) return permissions_list - \ No newline at end of file + + @staticmethod + def add_server_creation(user_id): + return crafty_permissions.add_server_creation(user_id) diff --git a/app/classes/web/server_handler.py b/app/classes/web/server_handler.py index 431b026d..e28e8a49 100644 --- a/app/classes/web/server_handler.py +++ b/app/classes/web/server_handler.py @@ -64,9 +64,9 @@ class ServerHandler(BaseHandler): }, 'hosts_data': self.controller.management.get_latest_hosts_stats(), 'menu_servers': defined_servers, - 'show_contribute': helper.get_setting("show_contribute_link", True) + 'show_contribute': helper.get_setting("show_contribute_link", True), + 'lang': self.controller.users.get_user_lang_by_id(exec_user_id) } - page_data['lang'] = self.controller.users.get_user_lang_by_id(exec_user_id) if page == "step1": if not exec_user['superuser'] and not self.controller.crafty_perms.can_create_server(exec_user_id): @@ -94,7 +94,8 @@ class ServerHandler(BaseHandler): page_data = { 'version_data': "version_data_here", 'user_data': exec_user_data, - 'show_contribute': helper.get_setting("show_contribute_link", True) + 'show_contribute': helper.get_setting("show_contribute_link", True), + 'lang': self.controller.users.get_user_lang_by_id(exec_user_id) } if page == "command": @@ -206,7 +207,7 @@ class ServerHandler(BaseHandler): role_id = self.controller.roles.add_role("Creator of Server with uuid={}".format(new_server_uuid)) self.controller.server_perms.add_role_server(new_server_id, role_id, "11111111") self.controller.users.add_role_to_user(exec_user_id, role_id) - self.controller.server_perms.add_server_creation(exec_user_id) + self.controller.crafty_perms.add_server_creation(exec_user_id) self.controller.stats.record_stats() self.redirect("/panel/dashboard")