Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/schedule-enable' into 'dev'

Browse Source 
Fix enabling/disabling schedules from schedule list

See merge request crafty-controller/crafty-4!606
This commit is contained in:
Iain Powrie 2023-07-18 20:02:02 +00:00
commit be37f8f49e
3 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -6,6 +6,7 @@ TBD
- Include tzdata in Docker image ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/604)) - 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)) - 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)) - 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 ### Tweaks
- Add public status link to login ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/608)) - Add public status link to login ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/608))
### Lang ### Lang

1
app/classes/web/routes/api/servers/server/tasks/index.py
View File

@ -92,6 +92,7 @@ class ApiServersServerTasksIndexHandler(BaseApiHandler):
data["start_time"] = "00:00" data["start_time"] = "00:00"
# validate cron string # validate cron string
if "cron_string" in data:
if data["cron_string"] != "" and not croniter.is_valid(data["cron_string"]): if data["cron_string"] != "" and not croniter.is_valid(data["cron_string"]):
return self.finish_json( return self.finish_json(
405, 405,

1
app/classes/web/routes/api/servers/server/tasks/task/index.py
View File

@ -136,6 +136,7 @@ class ApiServersServerTasksTaskIndexHandler(BaseApiHandler):
data["parent"] = None data["parent"] = None
data["server_id"] = server_id data["server_id"] = server_id
if "cron_string" in data:
if data["cron_string"] != "" and not croniter.is_valid(data["cron_string"]): if data["cron_string"] != "" and not croniter.is_valid(data["cron_string"]):
return self.finish_json( return self.finish_json(
405, 405,