diff --git a/CHANGELOG.md b/CHANGELOG.md index b0a3d005..09ebe717 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### New features TBD ### Bug fixes -TBD +- Fix SU status not sticking on user creation ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/410)) ### Tweaks TBD ### Lang diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py index fd4c2367..d592f627 100644 --- a/app/classes/web/panel_handler.py +++ b/app/classes/web/panel_handler.py @@ -1878,15 +1878,12 @@ class PanelHandler(BaseHandler): # We don't want that. Automatically make them stay super user # since we know they are. if str(exec_user["user_id"]) != str(user_id): - superuser = bleach.clean(self.get_argument("superuser", "0")) + superuser = int(bleach.clean(self.get_argument("superuser", "0"))) else: - superuser = "1" + superuser = 1 else: - superuser = "0" - if superuser == "1": - superuser = True - else: - superuser = False + superuser = 0 + if not exec_user["superuser"]: if username is None or username == "": self.redirect("/panel/error?error=Invalid username") @@ -2062,13 +2059,9 @@ class PanelHandler(BaseHandler): ) # We don't want a non-super user to be able to create a super user. if superuser: - new_superuser = bleach.clean(self.get_argument("superuser", "0")) + new_superuser = int(bleach.clean(self.get_argument("superuser", "0"))) else: - new_superuser = "0" - if superuser == "1": - new_superuser = True - else: - new_superuser = False + new_superuser = 0 if EnumPermissionsCrafty.USER_CONFIG not in exec_user_crafty_permissions: self.redirect(