更新为PageField

crm/api/doc.py

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

crm/install.py

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