mirror of
https://gitlab.com/crafty-controller/crafty-4.git
synced 2024-08-30 18:23:09 +00:00
Merge branch 'bug/remove-pesky-print' into 'dev'
Remove print statement everytime a page loads See merge request crafty-controller/crafty-commander!219
This commit is contained in:
commit
5c04e1e748
@ -181,10 +181,8 @@ class PanelHandler(BaseHandler):
|
|||||||
now = time.time()
|
now = time.time()
|
||||||
formatted_time = str(datetime.datetime.fromtimestamp(now).strftime('%Y-%m-%d %H:%M:%S'))
|
formatted_time = str(datetime.datetime.fromtimestamp(now).strftime('%Y-%m-%d %H:%M:%S'))
|
||||||
|
|
||||||
# pylint: disable=unused-variable
|
api_key, _token_data, exec_user = self.current_user
|
||||||
api_key, token_data, exec_user = self.current_user
|
|
||||||
superuser = exec_user['superuser']
|
superuser = exec_user['superuser']
|
||||||
print()
|
|
||||||
if api_key is not None:
|
if api_key is not None:
|
||||||
superuser = superuser and api_key.superuser
|
superuser = superuser and api_key.superuser
|
||||||
|
|
||||||
@ -532,8 +530,6 @@ class PanelHandler(BaseHandler):
|
|||||||
elif page == 'panel_config':
|
elif page == 'panel_config':
|
||||||
auth_servers = {}
|
auth_servers = {}
|
||||||
auth_role_servers = {}
|
auth_role_servers = {}
|
||||||
users_list = []
|
|
||||||
role_users = {}
|
|
||||||
roles = self.controller.roles.get_all_roles()
|
roles = self.controller.roles.get_all_roles()
|
||||||
user_roles = {}
|
user_roles = {}
|
||||||
for user in self.controller.users.get_all_users():
|
for user in self.controller.users.get_all_users():
|
||||||
@ -952,8 +948,7 @@ class PanelHandler(BaseHandler):
|
|||||||
|
|
||||||
@tornado.web.authenticated
|
@tornado.web.authenticated
|
||||||
def post(self, page):
|
def post(self, page):
|
||||||
# pylint: disable=unused-variable
|
api_key, _token_data, exec_user = self.current_user
|
||||||
api_key, token_data, exec_user = self.current_user
|
|
||||||
superuser = exec_user['superuser']
|
superuser = exec_user['superuser']
|
||||||
if api_key is not None:
|
if api_key is not None:
|
||||||
superuser = superuser and api_key.superuser
|
superuser = superuser and api_key.superuser
|
||||||
@ -1037,7 +1032,6 @@ class PanelHandler(BaseHandler):
|
|||||||
server_obj.path = server_obj.path
|
server_obj.path = server_obj.path
|
||||||
server_obj.log_path = server_obj.log_path
|
server_obj.log_path = server_obj.log_path
|
||||||
server_obj.executable = server_obj.executable
|
server_obj.executable = server_obj.executable
|
||||||
print(server_obj.execution_command)
|
|
||||||
server_obj.execution_command = server_obj.execution_command
|
server_obj.execution_command = server_obj.execution_command
|
||||||
server_obj.server_ip = server_obj.server_ip
|
server_obj.server_ip = server_obj.server_ip
|
||||||
server_obj.server_port = server_obj.server_port
|
server_obj.server_port = server_obj.server_port
|
||||||
@ -1683,8 +1677,7 @@ class PanelHandler(BaseHandler):
|
|||||||
|
|
||||||
@tornado.web.authenticated
|
@tornado.web.authenticated
|
||||||
def delete(self, page):
|
def delete(self, page):
|
||||||
# pylint: disable=unused-variable
|
api_key, _token_data, exec_user = self.current_user
|
||||||
api_key, token_data, exec_user = self.current_user
|
|
||||||
superuser = exec_user['superuser']
|
superuser = exec_user['superuser']
|
||||||
if api_key is not None:
|
if api_key is not None:
|
||||||
superuser = superuser and api_key.superuser
|
superuser = superuser and api_key.superuser
|
||||||
|
Loading…
Reference in New Issue
Block a user