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

Working out bugs in regular user language

Browse Source
This commit is contained in:
Andrew 2021-09-29 19:50:51 -04:00
parent 72a85d7e64
commit fc4e8a00e1
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -391,7 +391,7 @@ class PanelHandler(BaseHandler):
page_data['permissions_list'] = self.controller.crafty_perms.get_crafty_permissions_list(user_id) page_data['permissions_list'] = self.controller.crafty_perms.get_crafty_permissions_list(user_id)
page_data['quantity_server'] = self.controller.crafty_perms.list_crafty_permissions_quantity_limits(user_id) page_data['quantity_server'] = self.controller.crafty_perms.list_crafty_permissions_quantity_limits(user_id)
page_data['languages'] = [] page_data['languages'] = []
page_data['languages'].append(self.controller.users.get_user_lang_by_id(exec_user_id)) page_data['languages'].append(self.controller.users.get_user_lang_by_id(user_id))
for file in os.listdir(os.path.join(helper.root_dir, 'app', 'translations')): for file in os.listdir(os.path.join(helper.root_dir, 'app', 'translations')):
if file.endswith('.json'): if file.endswith('.json'):
if file != str(page_data['languages'][0] + '.json'): if file != str(page_data['languages'][0] + '.json'):
@ -401,7 +401,9 @@ class PanelHandler(BaseHandler):
self.redirect("/panel/error?error=Invalid User ID") self.redirect("/panel/error?error=Invalid User ID")
return return
elif Enum_Permissions_Crafty.User_Config not in exec_user_crafty_permissions: elif Enum_Permissions_Crafty.User_Config not in exec_user_crafty_permissions:
if user_id != exec_user_id: if str(user_id) != str(exec_user_id):
print("USER ID ", user_id)
print("EXEC ID ", exec_user_id)
self.redirect("/panel/error?error=Unauthorized access: not a user editor") self.redirect("/panel/error?error=Unauthorized access: not a user editor")
return return
@ -707,13 +709,14 @@ class PanelHandler(BaseHandler):
lang = bleach.clean(self.get_argument('language'), 'en_EN') lang = bleach.clean(self.get_argument('language'), 'en_EN')
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 user_id != exec_user_id: if str(user_id) != str(exec_user_id):
self.redirect("/panel/error?error=Unauthorized access: not a user editor") self.redirect("/panel/error?error=Unauthorized access: not a user editor")
return return
user_data = { user_data = {
"username": username, "username": username,
"password": password0, "password": password0,
"lang": lang,
} }
self.controller.users.update_user(user_id, user_data=user_data) self.controller.users.update_user(user_id, user_data=user_data)
@ -777,7 +780,7 @@ class PanelHandler(BaseHandler):
"enabled": enabled, "enabled": enabled,
"regen_api": regen_api, "regen_api": regen_api,
"roles": roles, "roles": roles,
"lang": lang "lang": lang,
} }
user_crafty_data = { user_crafty_data = {
"permissions_mask": permissions_mask, "permissions_mask": permissions_mask,