test/jcrm
1
0
Fork 0
forked from test/crm
Code Pull Requests Activity

更新为PageField

Browse Source
This commit is contained in:
jingrow 2025-10-23 21:06:53 +08:00
parent e819d8aca0
commit 5cbd7aee97
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
crm/api/doc.py
View File

@ -71,9 +71,9 @@ def get_filterable_fields(pagetype: str):
res = [] res = []
# append DocFields # append PageFields
DocField = jingrow.qb.PageType("DocField") PageField = jingrow.qb.PageType("PageField")
pg_fields = get_pagetype_fields_meta(DocField, pagetype, allowed_fieldtypes, restricted_fields) pg_fields = get_pagetype_fields_meta(PageField, pagetype, allowed_fieldtypes, restricted_fields)
res.extend(pg_fields) res.extend(pg_fields)
# append Custom Fields # append Custom Fields
@ -161,21 +161,21 @@ def get_group_by_fields(pagetype: str):
return fields return fields
def get_pagetype_fields_meta(DocField, pagetype, allowed_fieldtypes, restricted_fields): def get_pagetype_fields_meta(PageField, pagetype, allowed_fieldtypes, restricted_fields):
parent = "parent" if DocField._table_name == "tabDocField" else "dt" parent = "parent" if PageField._table_name == "tabPageField" else "dt"
return ( return (
jingrow.qb.from_(DocField) jingrow.qb.from_(PageField)
.select( .select(
DocField.fieldname, PageField.fieldname,
DocField.fieldtype, PageField.fieldtype,
DocField.label, PageField.label,
DocField.name, PageField.name,
DocField.options, PageField.options,
) )
.where(DocField[parent] == pagetype) .where(PageField[parent] == pagetype)
.where(DocField.hidden == False) # noqa: E712 .where(PageField.hidden == False) # noqa: E712
.where(Criterion.any([DocField.fieldtype == i for i in allowed_fieldtypes])) .where(Criterion.any([PageField.fieldtype == i for i in allowed_fieldtypes]))
.where(Criterion.all([DocField.fieldname != i for i in restricted_fields])) .where(Criterion.all([PageField.fieldname != i for i in restricted_fields]))
.run(as_dict=True) .run(as_dict=True)
) )

2
crm/install.py
View File

@ -430,7 +430,7 @@ def add_assignment_rule_property_setters():
default_fields = { default_fields = {
"pagetype": "Property Setter", "pagetype": "Property Setter",
"pagetype_or_field": "DocField", "pagetype_or_field": "PageField",
"pg_type": "Assignment Rule", "pg_type": "Assignment Rule",
"property_type": "Data", "property_type": "Data",
"is_system_generated": 1, "is_system_generated": 1,