Merge branch 'pretzel-fixes' into 'dev'

Fix bug where server_obj method was not defined

See merge request crafty-controller/crafty-commander!157
This commit is contained in:
Andrew 2022-01-29 00:16:51 +00:00
commit fda3f21a5a

View File

@ -358,9 +358,6 @@ class PanelHandler(BaseHandler):
if not superuser: if not superuser:
self.redirect("/panel/error?error=Unauthorized access to Terminal") self.redirect("/panel/error?error=Unauthorized access to Terminal")
return return
server_obj = Servers_Controller.get_server_obj(server_id)
if page_data['server_stats']['running']:
server_obj.clear_term()
if subpage == 'logs': if subpage == 'logs':
if not page_data['permissions']['Logs'] in page_data['user_permissions']: if not page_data['permissions']['Logs'] in page_data['user_permissions']: