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

Addind support for -1 unlimited check

Browse Source
This commit is contained in:
Silversthorn 2021-08-25 20:22:43 +02:00
parent 86ad734f4d
commit f4ca0f6559
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/classes/shared/controller.py
View File

@ -152,11 +152,13 @@ class Controller:
@staticmethod @staticmethod
def can_add_user(user_id): def can_add_user(user_id):
#TODO: Complete if we need a User Addition limit #TODO: Complete if we need a User Addition limit
#return db_helper.can_add_in_crafty(user_id, Enum_Permissions_Crafty.User_Config)
return True return True
@staticmethod @staticmethod
def can_add_role(user_id): def can_add_role(user_id):
#TODO: Complete if we need a User Addition limit #TODO: Complete if we need a User Addition limit
#return db_helper.can_add_in_crafty(user_id, Enum_Permissions_Crafty.Roles_Config)
return True return True
@staticmethod @staticmethod

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

@ -494,7 +494,7 @@ class db_shortcuts:
can = crafty_permissions.has_permission(user_crafty.permissions, permission) can = crafty_permissions.has_permission(user_crafty.permissions, permission)
limit_list = db_helper.get_permission_quantity_list(user_id) limit_list = db_helper.get_permission_quantity_list(user_id)
quantity_list = db_helper.get_created_quantity_list(user_id) quantity_list = db_helper.get_created_quantity_list(user_id)
return can and quantity_list[permission.name] < limit_list[permission.name] return can and ((quantity_list[permission.name] < limit_list[permission.name]) or limit_list[permission.name] == -1 )
@staticmethod @staticmethod
def add_server_creation(user_id): def add_server_creation(user_id):

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

@ -711,7 +711,7 @@ class PanelHandler(BaseHandler):
if argument: if argument:
roles.add(role.role_id) roles.add(role.role_id)
permissions_mask = "00000000" permissions_mask = "000"
server_quantity = {} server_quantity = {}
for permission in self.controller.list_defined_crafty_permissions(): for permission in self.controller.list_defined_crafty_permissions():
argument = int(float( argument = int(float(
@ -729,7 +729,6 @@ class PanelHandler(BaseHandler):
)) ))
if q_argument: if q_argument:
server_quantity[permission.name] = q_argument server_quantity[permission.name] = q_argument
else: else:
server_quantity[permission.name] = 0 server_quantity[permission.name] = 0
@ -785,7 +784,7 @@ class PanelHandler(BaseHandler):
if argument: if argument:
roles.add(role.role_id) roles.add(role.role_id)
permissions_mask = "00000000" permissions_mask = "000"
server_quantity = {} server_quantity = {}
for permission in self.controller.list_defined_crafty_permissions(): for permission in self.controller.list_defined_crafty_permissions():
argument = int(float( argument = int(float(
@ -803,7 +802,6 @@ class PanelHandler(BaseHandler):
)) ))
if q_argument: if q_argument:
server_quantity[permission.name] = q_argument server_quantity[permission.name] = q_argument
else: else:
server_quantity[permission.name] = 0 server_quantity[permission.name] = 0