diff --git a/app/classes/models/crafty_permissions.py b/app/classes/models/crafty_permissions.py index 13e89a6b..a35d4f50 100644 --- a/app/classes/models/crafty_permissions.py +++ b/app/classes/models/crafty_permissions.py @@ -9,6 +9,7 @@ from peewee import ( from app.classes.models.base_model import BaseModel from app.classes.models.users import Users, ApiKeys, helper_users +from app.classes.shared.permission_helper import PermissionHelper logger = logging.getLogger(__name__) @@ -209,7 +210,7 @@ class Permissions_Crafty: user["user_id"] ) key_permissions_mask: str = key.crafty_permissions - permissions_mask = helper_users.combine_masks( + permissions_mask = PermissionHelper.combine_masks( user_permissions_mask, key_permissions_mask ) permissions_list = Permissions_Crafty.get_permissions(permissions_mask) diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py index 0971e4e8..7125f423 100644 --- a/app/classes/shared/server.py +++ b/app/classes/shared/server.py @@ -762,7 +762,7 @@ class Server: return False def backup_server(self): - if self.settings["backup_path"] is "": + if self.settings["backup_path"] == "": return backup_thread = threading.Thread( target=self.a_backup_server, daemon=True, name=f"backup_{self.name}"