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

Merge branch 'dev' into dev-PathHelpers

Browse Source
This commit is contained in:
Silversthorn 2021-11-21 11:56:07 +01:00
commit ea48bd5562
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/classes/shared/tasks.py
View File

@ -114,7 +114,7 @@ class TasksManager:
svr.backup_server()
elif command == "update_executable":
svr.jar_update(user_lang)
svr.jar_update()
management_helper.mark_command_complete(c.get('command_id', None))
time.sleep(1)

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

@ -340,8 +340,11 @@ class PanelHandler(BaseHandler):
page_data['user-roles'] = user_roles
if exec_user['superuser'] == 1:
super_auth_servers = []
super_auth_servers.append("Access To All Servers")
page_data['users'] = self.controller.users.get_all_users()
page_data['roles'] = self.controller.roles.get_all_roles()
page_data['auth-servers'][exec_user['user_id']] = super_auth_servers
else:
page_data['users'] = self.controller.users.user_query(exec_user['user_id'])
page_data['roles'] = self.controller.users.user_role_query(exec_user['user_id'])