From d6439f26f533281e1a7086826ca212c78240d7a1 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 18 Feb 2021 14:57:02 +0530 Subject: [PATCH 1/2] fix: Scheduled Job Type execute not working --- frappe/core/doctype/scheduled_job_type/scheduled_job_type.py | 3 ++- frappe/public/js/frappe/form/form.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py index 0d6aa3d7d1..9e0f151dd6 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py @@ -69,7 +69,7 @@ class ScheduledJobType(Document): def execute(self): self.scheduler_log = None try: - self.log_status('Start') + self.log_status('Started') if self.server_script: script_name = frappe.db.get_value("Server Script", self.server_script) if script_name: @@ -115,6 +115,7 @@ def execute_event(doc): frappe.only_for('System Manager') doc = json.loads(doc) frappe.get_doc('Scheduled Job Type', doc.get('name')).enqueue(force=True) + return doc def run_scheduled_job(job_type): diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index a70797e295..bb4cedfe91 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -334,7 +334,7 @@ frappe.ui.form.Form = class FrappeForm { } } if (action.action_type==='Server Action') { - frappe.xcall(action.action, {doc: this.doc}).then((doc) => { + frappe.xcall(action.action, {'doc': this.doc}).then((doc) => { if (doc.doctype) { // document is returned by the method, // apply the changes locally and refresh From ec9dadf700e8d9b1393e592f2b0c2c536194f264 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Wed, 24 Feb 2021 17:21:52 +0530 Subject: [PATCH 2/2] fix: Resolve merge error --- frappe/core/doctype/scheduled_job_type/scheduled_job_type.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py index 2c86b6efd7..fe39f51ce9 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py @@ -116,8 +116,8 @@ class ScheduledJobType(Document): def execute_event(doc: str): frappe.only_for("System Manager") doc = json.loads(doc) - frappe.get_doc("Scheduled Job Type", doc.get("name")).enqueue(force=True) - return doc + frappe.get_doc("Scheduled Job Type", doc.get("name")).enqueue(force=True) + return doc def run_scheduled_job(job_type: str):