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

Fix enabling schedules from schedule list

Browse Source
This commit is contained in:
Andrew 2023-07-04 12:10:59 -04:00
parent 2a1fb3bde8
commit 45b0264499
2 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,20 +92,21 @@ class ApiServersServerTasksIndexHandler(BaseApiHandler):
data["start_time"] = "00:00" data["start_time"] = "00:00"
# validate cron string # validate cron string
if data["cron_string"] != "" and not croniter.is_valid(data["cron_string"]): if "cron_string" in data:
return self.finish_json( if data["cron_string"] != "" and not croniter.is_valid(data["cron_string"]):
405, return self.finish_json(
{ 405,
"status": "error", {
"error": self.helper.translation.translate( "status": "error",
"error", "error": self.helper.translation.translate(
"cronFormat", "error",
self.controller.users.get_user_lang_by_id( "cronFormat",
auth_data[4]["user_id"] self.controller.users.get_user_lang_by_id(
auth_data[4]["user_id"]
),
), ),
), },
}, )
)
if "parent" not in data: if "parent" not in data:
data["parent"] = None data["parent"] = None
task_id = self.tasks_manager.schedule_job(data) task_id = self.tasks_manager.schedule_job(data)

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

@ -136,20 +136,21 @@ class ApiServersServerTasksTaskIndexHandler(BaseApiHandler):
data["parent"] = None data["parent"] = None
data["server_id"] = server_id data["server_id"] = server_id
if data["cron_string"] != "" and not croniter.is_valid(data["cron_string"]): if "cron_string" in data:
return self.finish_json( if data["cron_string"] != "" and not croniter.is_valid(data["cron_string"]):
405, return self.finish_json(
{ 405,
"status": "error", {
"error": self.helper.translation.translate( "status": "error",
"error", "error": self.helper.translation.translate(
"cronFormat", "error",
self.controller.users.get_user_lang_by_id( "cronFormat",
auth_data[4]["user_id"] self.controller.users.get_user_lang_by_id(
auth_data[4]["user_id"]
),
), ),
), },
}, )
)
self.tasks_manager.update_job(task_id, data) self.tasks_manager.update_job(task_id, data)
self.controller.management.add_to_audit_log( self.controller.management.add_to_audit_log(