Merge branch 'dev' into macgeek.db

This commit is contained in:
computergeek125 2022-04-10 18:10:22 -05:00
commit f42a697837
2 changed files with 77 additions and 74 deletions

View File

@ -1758,8 +1758,11 @@ class PanelHandler(BaseHandler):
superuser = True superuser = True
else: else:
superuser = False superuser = False
if not exec_user["superuser"]:
if Enum_Permissions_Crafty.User_Config not in exec_user_crafty_permissions: if (
Enum_Permissions_Crafty.User_Config
not in exec_user_crafty_permissions
):
if str(user_id) != str(exec_user["user_id"]): if str(user_id) != str(exec_user["user_id"]):
self.redirect( self.redirect(
"/panel/error?error=Unauthorized access: not a user editor" "/panel/error?error=Unauthorized access: not a user editor"
@ -1794,7 +1797,7 @@ class PanelHandler(BaseHandler):
if not self.controller.users.user_id_exists(user_id): if not self.controller.users.user_id_exists(user_id):
self.redirect("/panel/error?error=Invalid User ID") self.redirect("/panel/error?error=Invalid User ID")
return return
else:
if password0 != password1: if password0 != password1:
self.redirect("/panel/error?error=Passwords must match") self.redirect("/panel/error?error=Passwords must match")
return return