vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: Fetch non-cached version of Meta on Customize Form. (#21269)

Browse source 
* fix: Replace meta cache when uncached meta is requested

* fix: use meta from DB on customize form

* refactor: make cached kw only, use _dev_server
This commit is contained in:
Ankush Menat 2023-06-12 14:59:42 +05:30 • committed by GitHub
parent 98260b3c88
commit 8a30667a97
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/desk/form/load.py
View file

@ -80,7 +80,7 @@ def get_meta_bundle(doctype):
bundle = [frappe.desk.form.meta.get_meta(doctype)]
for df in bundle[0].fields:
if df.fieldtype in frappe.model.table_fields:
bundle.append(frappe.desk.form.meta.get_meta(df.options, not frappe.conf.developer_mode))
bundle.append(frappe.desk.form.meta.get_meta(df.options))
return bundle

12
frappe/desk/form/meta.py
View file

@ -34,12 +34,14 @@ ASSET_KEYS = (
)
def get_meta(doctype, cached=True):
def get_meta(doctype, cached=True) -> "FormMeta":
# don't cache for developer mode as js files, templates may be edited
if cached and not frappe.conf.developer_mode:
cached = cached and not frappe._dev_server
if cached:
meta = frappe.cache.hget("doctype_form_meta", doctype)
if not meta:
meta = FormMeta(doctype)
# Cache miss - explicitly get meta from DB to avoid
meta = FormMeta(doctype, cached=False)
frappe.cache.hset("doctype_form_meta", doctype, meta)
else:
meta = FormMeta(doctype)
@ -51,8 +53,8 @@ def get_meta(doctype, cached=True):
class FormMeta(Meta):
def __init__(self, doctype):
self.__dict__.update(frappe.get_meta(doctype).__dict__)
def __init__(self, doctype, *, cached=True):
self.__dict__.update(frappe.get_meta(doctype, cached=cached).__dict__)
self.load_assets()
def load_assets(self):

8
frappe/model/meta.py
View file

@ -56,14 +56,12 @@ DEFAULT_FIELD_LABELS = {
def get_meta(doctype, cached=True) -> "Meta":
if not cached:
return Meta(doctype)
if meta := frappe.cache.hget("doctype_meta", doctype):
cached = cached and isinstance(doctype, str)
if cached and (meta := frappe.cache.hget("doctype_meta", doctype)):
return meta
meta = Meta(doctype)
frappe.cache.hset("doctype_meta", doctype, meta)
frappe.cache.hset("doctype_meta", meta.name, meta)
return meta