diff --git a/app/classes/controllers/users_controller.py b/app/classes/controllers/users_controller.py
index 933942c6..1a6575a7 100644
--- a/app/classes/controllers/users_controller.py
+++ b/app/classes/controllers/users_controller.py
@@ -72,6 +72,7 @@ class Users_Controller:
up_data[key] = user_data[key]
up_data["last_update"] = helper.get_time_as_string()
up_data["lang"] = user_data["lang"]
+ up_data["hints"] = user_data["hints"]
logger.debug(f"user: {user_data} +role:{added_roles} -role:{removed_roles}")
for role in added_roles:
users_helper.get_or_create(user_id=user_id, role_id=role)
diff --git a/app/classes/models/users.py b/app/classes/models/users.py
index b9dd1d81..f9e9f311 100644
--- a/app/classes/models/users.py
+++ b/app/classes/models/users.py
@@ -49,6 +49,7 @@ class Users(Model):
valid_tokens_from = DateTimeField(default=datetime.datetime.now)
server_order = CharField(default="")
preparing = BooleanField(default=False)
+ hints = BooleanField(default=True)
class Meta:
table_name = "users"
diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 7d0e77a7..a1071a21 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -769,6 +769,7 @@ class PanelHandler(BaseHandler):
page_data["user"]["last_ip"] = "N/A"
page_data["user"]["last_update"] = "N/A"
page_data["user"]["roles"] = set()
+ page_data["user"]["hints"] = True
if Enum_Permissions_Crafty.User_Config not in exec_user_crafty_permissions:
self.redirect(
@@ -1734,6 +1735,11 @@ class PanelHandler(BaseHandler):
password1 = bleach.clean(self.get_argument("password1", None))
email = bleach.clean(self.get_argument("email", "default@example.com"))
enabled = int(float(self.get_argument("enabled", "0")))
+ try:
+ hints = int(bleach.clean(self.get_argument("hints")))
+ hints = True
+ except:
+ hints = False
lang = bleach.clean(
self.get_argument("language"), helper.get_setting("language")
)
@@ -1765,6 +1771,7 @@ class PanelHandler(BaseHandler):
"password": password0,
"email": email,
"lang": lang,
+ "hints": hints,
}
self.controller.users.update_user(user_id, user_data=user_data)
@@ -1806,6 +1813,7 @@ class PanelHandler(BaseHandler):
"roles": roles,
"lang": lang,
"superuser": superuser,
+ "hints": hints,
}
user_crafty_data = {
"permissions_mask": permissions_mask,
@@ -1901,6 +1909,7 @@ class PanelHandler(BaseHandler):
password1 = bleach.clean(self.get_argument("password1", None))
email = bleach.clean(self.get_argument("email", "default@example.com"))
enabled = int(float(self.get_argument("enabled", "0")))
+ hints = True
lang = bleach.clean(
self.get_argument("lang", helper.get_setting("language"))
)
@@ -1942,10 +1951,7 @@ class PanelHandler(BaseHandler):
enabled=enabled,
superuser=new_superuser,
)
- user_data = {
- "roles": roles,
- "lang": lang,
- }
+ user_data = {"roles": roles, "lang": lang, "hints": True}
user_crafty_data = {
"permissions_mask": permissions_mask,
"server_quantity": server_quantity,
diff --git a/app/frontend/templates/panel/activity_logs.html b/app/frontend/templates/panel/activity_logs.html
index c8717f38..389edaf5 100644
--- a/app/frontend/templates/panel/activity_logs.html
+++ b/app/frontend/templates/panel/activity_logs.html
@@ -9,7 +9,7 @@
-
+
-
0 {{ translate('dashboard', 'max', data['lang']) }}
+
0 {{ translate('dashboard', 'max',
+ data['lang']) }}
{% if server['user_command_permission'] %}
{% if server['stats']['running'] %}
-
+
-
+
-
+
@@ -160,20 +164,21 @@
{{ translate('dashboard', 'starting',
data['lang']) }}
- {% elif server['stats']['downloading']%}
-
+
-
+
-
+
{% end %}
@@ -228,7 +233,9 @@
data['lang']) }} {{ server['stats']['desc'] }}
{{
+ server['stats']['desc'] }}
{% if server['stats']['running'] %}
-
-
'
});
});
- $(".kill_button").click(function() {
+ $(".kill_button").click(function () {
server_id = $(this).attr("data-id");
bootbox.confirm({
message: "This will kill the server process and all it's subprocesses. Killing a process can potentially corrupt files. Only do this in extreme circumstances. Are you sure you would like to continue?",
@@ -513,7 +526,7 @@
className: 'btn-secondary'
}
},
- callback: function(result) {
+ callback: function (result) {
if (result) {
send_kill(server_id);
let dialog = bootbox.dialog({
@@ -521,8 +534,8 @@
message: '
'
});
- dialog.init(function() {
- setTimeout(function() {
+ dialog.init(function () {
+ setTimeout(function () {
location.reload();
}, 15000);
});
@@ -537,7 +550,7 @@
mem_percent = document.getElementById('mem_percent');
- webSocket.on('update_host_stats', function(hostStats) {
+ webSocket.on('update_host_stats', function (hostStats) {
let cpuDataTitle = `{% raw translate('dashboard', 'cpuCores', data['lang']) %}: ${hostStats.cpu_cores}
-
+