From e5e5d529ae0ee765383d04c597038b21401038d2 Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Mon, 19 Jun 2023 20:28:36 -0400 Subject: [PATCH 1/9] Fix text for public status page --- .../templates/panel/server_config.html | 44 +------------------ 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/app/frontend/templates/panel/server_config.html b/app/frontend/templates/panel/server_config.html index a3c0b4a8..913a2000 100644 --- a/app/frontend/templates/panel/server_config.html +++ b/app/frontend/templates/panel/server_config.html @@ -166,48 +166,6 @@ - -
{% if data['server_stats']['server_id']['auto_start'] %} @@ -237,7 +195,7 @@ {% else %} -   {{ translate('serverConfig', 'showStatus', data['lang']) }} +    {% end %} {% end %} From 8af726cd7972b3ea59a03b16a692509cd7f5f629 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Sat, 1 Jul 2023 13:22:19 +0100 Subject: [PATCH 2/9] Update changelog !602 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c1b814a..4814ca39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ TBD ### Bug fixes - Include tzdata in Docker image ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/604)) +- Fix text/formatting issue on server config page ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/602)) ### Tweaks TBD ### Lang From 45b02644997bb0e6e2fd6d547f294fa554f30d70 Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 4 Jul 2023 12:10:59 -0400 Subject: [PATCH 3/9] Fix enabling schedules from schedule list --- .../routes/api/servers/server/tasks/index.py | 27 ++++++++++--------- .../api/servers/server/tasks/task/index.py | 27 ++++++++++--------- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/app/classes/web/routes/api/servers/server/tasks/index.py b/app/classes/web/routes/api/servers/server/tasks/index.py index 72f8def4..8e98bbbe 100644 --- a/app/classes/web/routes/api/servers/server/tasks/index.py +++ b/app/classes/web/routes/api/servers/server/tasks/index.py @@ -92,20 +92,21 @@ class ApiServersServerTasksIndexHandler(BaseApiHandler): data["start_time"] = "00:00" # validate cron string - if data["cron_string"] != "" and not croniter.is_valid(data["cron_string"]): - return self.finish_json( - 405, - { - "status": "error", - "error": self.helper.translation.translate( - "error", - "cronFormat", - self.controller.users.get_user_lang_by_id( - auth_data[4]["user_id"] + if "cron_string" in data: + if data["cron_string"] != "" and not croniter.is_valid(data["cron_string"]): + return self.finish_json( + 405, + { + "status": "error", + "error": self.helper.translation.translate( + "error", + "cronFormat", + self.controller.users.get_user_lang_by_id( + auth_data[4]["user_id"] + ), ), - ), - }, - ) + }, + ) if "parent" not in data: data["parent"] = None task_id = self.tasks_manager.schedule_job(data) diff --git a/app/classes/web/routes/api/servers/server/tasks/task/index.py b/app/classes/web/routes/api/servers/server/tasks/task/index.py index 1db5ccf1..742312a6 100644 --- a/app/classes/web/routes/api/servers/server/tasks/task/index.py +++ b/app/classes/web/routes/api/servers/server/tasks/task/index.py @@ -136,20 +136,21 @@ class ApiServersServerTasksTaskIndexHandler(BaseApiHandler): data["parent"] = None data["server_id"] = server_id - if data["cron_string"] != "" and not croniter.is_valid(data["cron_string"]): - return self.finish_json( - 405, - { - "status": "error", - "error": self.helper.translation.translate( - "error", - "cronFormat", - self.controller.users.get_user_lang_by_id( - auth_data[4]["user_id"] + if "cron_string" in data: + if data["cron_string"] != "" and not croniter.is_valid(data["cron_string"]): + return self.finish_json( + 405, + { + "status": "error", + "error": self.helper.translation.translate( + "error", + "cronFormat", + self.controller.users.get_user_lang_by_id( + auth_data[4]["user_id"] + ), ), - ), - }, - ) + }, + ) self.tasks_manager.update_job(task_id, data) self.controller.management.add_to_audit_log( From d2f56a65560a97c32f824ff720649b8dec288804 Mon Sep 17 00:00:00 2001 From: Andrew Date: Wed, 5 Jul 2023 21:48:55 -0400 Subject: [PATCH 4/9] Add link to status page to login --- app/frontend/templates/public/login.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/frontend/templates/public/login.html b/app/frontend/templates/public/login.html index 971edca1..c414daa8 100644 --- a/app/frontend/templates/public/login.html +++ b/app/frontend/templates/public/login.html @@ -120,6 +120,10 @@ Crafty Control {{data['version'] }}
+ +
+ View Public Status Page +
From 345fee7e5d4655fa057b424f7029a08849527f37 Mon Sep 17 00:00:00 2001 From: Andrew Date: Wed, 5 Jul 2023 21:51:15 -0400 Subject: [PATCH 5/9] Add translation --- app/frontend/templates/public/login.html | 3 ++- app/translations/en_EN.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/frontend/templates/public/login.html b/app/frontend/templates/public/login.html index c414daa8..fbaca946 100644 --- a/app/frontend/templates/public/login.html +++ b/app/frontend/templates/public/login.html @@ -122,7 +122,8 @@
- View Public Status Page + {{ translate('login', 'viewStatus', + data['lang']) }}
diff --git a/app/translations/en_EN.json b/app/translations/en_EN.json index 54895ca4..5da22d2a 100644 --- a/app/translations/en_EN.json +++ b/app/translations/en_EN.json @@ -203,7 +203,8 @@ "forgotPassword": "Forgot Password", "login": "Log In", "password": "Password", - "username": "Username" + "username": "Username", + "viewStatus": "View Public Status Page" }, "notify": { "activityLog": "Activity Logs", From ad28f84188d57fa2bb5ca4c76ea3cac5d3be9f0c Mon Sep 17 00:00:00 2001 From: Wout Bouckaert Date: Mon, 17 Jul 2023 19:01:26 -0600 Subject: [PATCH 6/9] Bump PyYAML to 6.0.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 715e8537..98e095f1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pexpect==4.8 psutil==5.9 pyOpenSSL==23.2.0 pyjwt==2.4.0 -PyYAML==5.4 +PyYAML==6.0.1 requests==2.31 termcolor==1.1 tornado==6.3.2 From 1fb4edd463ea49acae0bef3834ee10ba63660566 Mon Sep 17 00:00:00 2001 From: Iain Powrie Date: Tue, 18 Jul 2023 19:19:34 +0000 Subject: [PATCH 7/9] Update changelog !609 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4814ca39..3c7f5fd6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ TBD ### Bug fixes - Include tzdata in Docker image ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/604)) - Fix text/formatting issue on server config page ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/602)) +- Bump required version of PyYAML to 6.0.1 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/609)) ### Tweaks TBD ### Lang From dcfc3f00fe921fb8498cc8022fec5ad88c47a073 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Tue, 18 Jul 2023 20:42:13 +0100 Subject: [PATCH 8/9] Update changelog !608 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c7f5fd6..6b79b960 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ TBD - Fix text/formatting issue on server config page ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/602)) - Bump required version of PyYAML to 6.0.1 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/609)) ### Tweaks -TBD +- Add public status link to login ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/608)) ### Lang TBD

From 748db1866ac1a9f13c8ccfc89bae6320db830fbe Mon Sep 17 00:00:00 2001 From: Zedifus Date: Tue, 18 Jul 2023 20:57:30 +0100 Subject: [PATCH 9/9] Update changelog !606 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b79b960..98292835 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ TBD - Include tzdata in Docker image ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/604)) - Fix text/formatting issue on server config page ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/602)) - Bump required version of PyYAML to 6.0.1 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/609)) +- Fix enable/disable schedule toggles on schedule list ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/606)) ### Tweaks - Add public status link to login ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/608)) ### Lang