diff --git a/app/classes/web/routes/api/servers/server/files.py b/app/classes/web/routes/api/servers/server/files.py index 3fb99796..9ed720ac 100644 --- a/app/classes/web/routes/api/servers/server/files.py +++ b/app/classes/web/routes/api/servers/server/files.py @@ -86,8 +86,8 @@ class ApiServersServerFilesIndexHandler(BaseApiHandler): not in self.controller.server_perms.get_user_id_permissions_list( auth_data[4]["user_id"], server_id ) - or not EnumPermissionsServer.BACKUP - in self.controller.server_perms.get_user_id_permissions_list( + or EnumPermissionsServer.BACKUP + not in self.controller.server_perms.get_user_id_permissions_list( auth_data[4]["user_id"], server_id ) ): diff --git a/app/classes/web/routes/api/users/user/index.py b/app/classes/web/routes/api/users/user/index.py index 898a9fda..73f17f9f 100644 --- a/app/classes/web/routes/api/users/user/index.py +++ b/app/classes/web/routes/api/users/user/index.py @@ -242,12 +242,11 @@ class ApiUsersUserIndexHandler(BaseApiHandler): user_id, removed_roles ) - if "manager" in data: - if ( - data["manager"] == self.controller.users.get_id_by_name("SYSTEM") - or data["manager"] == 0 - ): - data["manager"] = None + if "manager" in data and ( + data["manager"] == self.controller.users.get_id_by_name("SYSTEM") + or data["manager"] == 0 + ): + data["manager"] = None if "permissions" in data: permissions: t.List[UsersController.ApiPermissionDict] = data.pop( diff --git a/app/frontend/static/assets/js/shared/root-dir.js b/app/frontend/static/assets/js/shared/root-dir.js index 9f3f14ac..2a6f58fd 100644 --- a/app/frontend/static/assets/js/shared/root-dir.js +++ b/app/frontend/static/assets/js/shared/root-dir.js @@ -1,11 +1,11 @@ function show_file_tree() { - $("#dir_select").modal(); + $("#dir_select").modal(); } function getDirView(event = false) { if (event) { try { - path = event.target.parentElement.getAttribute('data-path'); + let path = event.target.parentElement.getAttribute('data-path'); if (event.target.parentElement.classList.contains('clicked')) { if ($(`#${path}span`).hasClass('files-tree-title')) { @@ -19,20 +19,18 @@ function getDirView(event = false) { } catch { console.log("Well that failed"); } + } else if ($("#root_files_button").hasClass("clicked")) { + path = $("#zip_server_path").val(); + getTreeView(path, true); } else { - if ($("#root_files_button").hasClass("clicked")) { - path = $("#zip_server_path").val(); - getTreeView(path, true); - } else { - path = $("#file-uploaded").val(); - getTreeView(path, true, true); - } + path = $("#file-uploaded").val(); + getTreeView(path, true, true); } - } + async function getTreeView(path, unzip = false, upload = false) { - var token = getCookie("_xsrf"); + const token = getCookie("_xsrf"); console.log("IN TREE VIEW") console.log({ "page": "import", "folder": path, "upload": upload, "unzip": unzip }); let res = await fetch(`/api/v2/import/file/unzip/`, { diff --git a/app/frontend/templates/base.html b/app/frontend/templates/base.html index fc56d45b..eca34e75 100755 --- a/app/frontend/templates/base.html +++ b/app/frontend/templates/base.html @@ -18,7 +18,7 @@ href="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.css" /> - + @@ -414,7 +414,7 @@ async function eulaAgree(server_id, command) { //< !--this getCookie function is in base.html-- > - var token = getCookie("_xsrf"); + const token = getCookie("_xsrf"); let res = await fetch(`/api/v2/servers/${server_id}/action/eula/`, { method: 'POST', @@ -544,7 +544,7 @@ }); $(document).ready(() => { if ('serviceWorker' in navigator) { - navigator.serviceWorker.register('/static/assets/js/shared/service-worker.js', {scope: '/'}) + navigator.serviceWorker.register('/static/assets/js/shared/service-worker.js', { scope: '/' }) .then(function (registration) { console.log('Service Worker Registered'); }); diff --git a/app/frontend/templates/panel/config_json.html b/app/frontend/templates/panel/config_json.html index a8d5e040..aabac37d 100644 --- a/app/frontend/templates/panel/config_json.html +++ b/app/frontend/templates/panel/config_json.html @@ -6,7 +6,8 @@ {% block title %}Crafty Controller - {{ translate('panelConfig', 'pageTitle', data['lang']) }}{% end %} {% block content %} - +
@@ -72,8 +73,11 @@ {% elif item[0] == 'disabled_language_files' %}
- - {% for lang in data['all_languages'] %} {% if lang in item[1] %} @@ -82,12 +86,17 @@ {% end %} {% end %} - +
{% elif item[0] == 'monitored_mounts'%}
- - {% for mount in data['all_partitions'] %} {% if mount in item[1] %} @@ -96,10 +105,13 @@ {% end %} {% end %} - +
{% elif isinstance(item[1], list) %} - + {% elif isinstance(item[1], bool) %}
{% if item[1] == True %} @@ -115,9 +127,11 @@ {% end %}
{% elif isinstance(item[1], int) %} - + {% else %} - + {% end %}
{% end %} @@ -155,9 +169,9 @@ {% block js %} -{% end %} +{% end %} \ No newline at end of file diff --git a/app/frontend/templates/panel/server_schedule_edit.html b/app/frontend/templates/panel/server_schedule_edit.html index ebded95e..b1260770 100644 --- a/app/frontend/templates/panel/server_schedule_edit.html +++ b/app/frontend/templates/panel/server_schedule_edit.html @@ -260,7 +260,7 @@ console.log("ready!"); $("#new_schedule_form").on("submit", async function (e) { e.preventDefault(); - var token = getCookie("_xsrf") + const token = getCookie("_xsrf") let schForm = document.getElementById("new_schedule_form"); let formData = new FormData(schForm); @@ -305,7 +305,7 @@ $("#schedule_form").on("submit", async function (e) { e.preventDefault(); - var token = getCookie("_xsrf") + const token = getCookie("_xsrf") let schForm = document.getElementById("schedule_form"); let formData = new FormData(schForm); diff --git a/app/frontend/templates/panel/server_schedules.html b/app/frontend/templates/panel/server_schedules.html index 78e43bb2..586c6ae4 100644 --- a/app/frontend/templates/panel/server_schedules.html +++ b/app/frontend/templates/panel/server_schedules.html @@ -47,14 +47,20 @@

{{ translate('serverSchedules', 'scheduledTasks', data['lang']) }}

{% if data['user_data']['hints'] %} - + {% end %}
- +
- +
{{ translate('serverSchedules', 'name', data['lang']) }} @@ -101,10 +107,14 @@

{{schedule.next_run}}

- + -
@@ -118,7 +128,8 @@

- +
-
{{ translate('serverSchedules', 'action', data['lang']) @@ -151,7 +162,8 @@