From 7e6ce22d64e845cacaf27f76d91b56ef6d91effa Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 22 Feb 2021 19:17:30 +0530 Subject: [PATCH 1/6] perf: optimise set_cors_headers (bp #12460) (#12462) (cherry picked from commit 68c6fc4a4417c6c36132ef25ec96af522d351dd6) Co-authored-by: Sagar Vora --- frappe/app.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/app.py b/frappe/app.py index adf2bfa8c9..7ec88b06cf 100644 --- a/frappe/app.py +++ b/frappe/app.py @@ -152,10 +152,10 @@ def process_response(response): def set_cors_headers(response): origin = frappe.request.headers.get('Origin') - if not origin: + allow_cors = frappe.conf.allow_cors + if not (origin and allow_cors): return - allow_cors = frappe.conf.allow_cors if allow_cors != "*": if not isinstance(allow_cors, list): allow_cors = [allow_cors] From cb43b906ede3e571cbac525331e65c1322da43bf Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Thu, 18 Feb 2021 13:33:12 +0530 Subject: [PATCH 2/6] fix: ignore notify update in patch execution --- frappe/model/document.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/model/document.py b/frappe/model/document.py index 9efd8b6c94..3545ac3857 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -1015,6 +1015,8 @@ class Document(BaseDocument): def notify_update(self): """Publish realtime that the current document is modified""" + if frappe.flags.in_patch: return + frappe.publish_realtime("doc_update", {"modified": self.modified, "doctype": self.doctype, "name": self.name}, doctype=self.doctype, docname=self.name, after_commit=True) From 0ccdd9317324786eca77e39a7b5a58bff8a6a4de Mon Sep 17 00:00:00 2001 From: Administrator Date: Wed, 24 Feb 2021 10:03:57 +0530 Subject: [PATCH 3/6] chore: Bump to v13.0.0-beta.11 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 7929e62acb..efe03bb3a5 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -23,7 +23,7 @@ if PY2: reload(sys) sys.setdefaultencoding("utf-8") -__version__ = '13.0.0-beta.10' +__version__ = '13.0.0-beta.11' __title__ = "Frappe Framework" From 84bc7e66acf2a974b20b28a3a4263193289d23a2 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 24 Feb 2021 14:07:38 +0530 Subject: [PATCH 4/6] fix: allow on submit for child table not working (bp #12381) (#12472) Co-authored-by: Prssanna Desai Co-authored-by: hasnain2808@gmail.com --- frappe/public/js/frappe/form/controls/base_control.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/base_control.js b/frappe/public/js/frappe/form/controls/base_control.js index d7f873bee0..9981398b84 100644 --- a/frappe/public/js/frappe/form/controls/base_control.js +++ b/frappe/public/js/frappe/form/controls/base_control.js @@ -74,7 +74,7 @@ frappe.ui.form.Control = Class.extend({ frappe.model.get_doc(this.doctype, this.docname), this.perm || (this.frm && this.frm.perm), explain); // Match parent grid controls read only status - if (status === 'Write' && (this.grid || (this.layout && this.layout.grid))) { + if (status === 'Write' && (this.grid || (this.layout && this.layout.grid) && !cint(this.df.allow_on_submit))) { var grid = this.grid || this.layout.grid; if (grid.display_status == 'Read') { status = 'Read'; From a34393b14625b37d367a1308ad6d72ce43da37f7 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Wed, 24 Feb 2021 14:56:43 +0530 Subject: [PATCH 5/6] Revert "chore: Bump to v13.0.0-beta.11" This reverts commit 0ccdd9317324786eca77e39a7b5a58bff8a6a4de. --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index efe03bb3a5..7929e62acb 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -23,7 +23,7 @@ if PY2: reload(sys) sys.setdefaultencoding("utf-8") -__version__ = '13.0.0-beta.11' +__version__ = '13.0.0-beta.10' __title__ = "Frappe Framework" From 94e797a787f8db0417f5697c448ac3c09333d02c Mon Sep 17 00:00:00 2001 From: Saurabh Date: Wed, 24 Feb 2021 15:20:23 +0550 Subject: [PATCH 6/6] bumped to version 13.0.0-beta.11 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 7929e62acb..efe03bb3a5 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -23,7 +23,7 @@ if PY2: reload(sys) sys.setdefaultencoding("utf-8") -__version__ = '13.0.0-beta.10' +__version__ = '13.0.0-beta.11' __title__ = "Frappe Framework"