mirror of
https://gitlab.com/crafty-controller/crafty-4.git
synced 2024-08-30 18:23:09 +00:00
Merge branch 'dev' into macgeek.db
This commit is contained in:
commit
f42a697837
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user