refactor: link to scheduled job type
This commit is contained in:
parent
58e291d61c
commit
8e6feb62c2
3 changed files with 14 additions and 2 deletions
|
|
@ -14,6 +14,7 @@
|
|||
"stopped",
|
||||
"method",
|
||||
"server_script",
|
||||
"scheduler_event",
|
||||
"frequency",
|
||||
"cron_format",
|
||||
"create_log",
|
||||
|
|
@ -93,6 +94,13 @@
|
|||
{
|
||||
"fieldname": "column_break_9",
|
||||
"fieldtype": "Column Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "scheduler_event",
|
||||
"fieldtype": "Link",
|
||||
"label": "Scheduler Event",
|
||||
"options": "Scheduler Event",
|
||||
"read_only": 1
|
||||
}
|
||||
],
|
||||
"in_create": 1,
|
||||
|
|
@ -102,7 +110,7 @@
|
|||
"link_fieldname": "scheduled_job_type"
|
||||
}
|
||||
],
|
||||
"modified": "2024-03-30 11:39:49.693632",
|
||||
"modified": "2025-01-13 10:39:39.975031",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Core",
|
||||
"name": "Scheduled Job Type",
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ class ScheduledJobType(Document):
|
|||
last_execution: DF.Datetime | None
|
||||
method: DF.Data
|
||||
next_execution: DF.Datetime | None
|
||||
scheduler_event: DF.Link | None
|
||||
server_script: DF.Link | None
|
||||
stopped: DF.Check
|
||||
# end: auto-generated types
|
||||
|
|
@ -267,6 +268,9 @@ def clear_events(scheduler_events: dict):
|
|||
if event.server_script:
|
||||
return True
|
||||
|
||||
if event.scheduler_event:
|
||||
return True
|
||||
|
||||
freq = frappe.scrub(event.frequency)
|
||||
if freq == "cron":
|
||||
return event.method in scheduler_events.get(freq, {}).get(event.cron_format, [])
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
"in_create": 1,
|
||||
"index_web_pages_for_search": 1,
|
||||
"links": [],
|
||||
"modified": "2025-01-13 10:31:06.968422",
|
||||
"modified": "2025-01-13 10:36:52.332434",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Core",
|
||||
"name": "Scheduler Event",
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue