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

fix: better sorting custom fields

Browse Source
This commit is contained in:
Shariq Ansari 2023-11-22 17:21:18 +05:30
parent b157f255f8
commit 267f42a7fe
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
crm/api/doc.py
View File

@ -95,15 +95,7 @@ def get_doctype_fields(doctype):
all_fields = [] all_fields = []
all_fields.extend(fields) all_fields.extend(fields)
# Add custom fields based on insert_after sort_custom_fields(custom_fields, all_fields)
for custom_field in custom_fields:
if custom_field.insert_after:
for i, field in enumerate(all_fields):
if field.fieldname == custom_field.insert_after:
all_fields.insert(i + 1, custom_field)
break
else:
all_fields.prepend(custom_field)
sections = {} sections = {}
section_fields = [] section_fields = []
@ -136,6 +128,25 @@ def get_doctype_fields(doctype):
return deal_fields return deal_fields
def sort_custom_fields(custom_fields, all_fields):
# sort custom fields based on insert_after
not_in_fields = []
for custom_field in custom_fields:
if custom_field.insert_after:
field_exists = False
for i, field in enumerate(all_fields):
if field.fieldname == custom_field.insert_after:
all_fields.insert(i + 1, custom_field)
field_exists = True
break
if not field_exists:
not_in_fields.append(custom_field)
else:
all_fields.prepend(custom_field)
if not_in_fields:
sort_custom_fields(not_in_fields, all_fields)
def get_field_obj(field): def get_field_obj(field):
obj = { obj = {
"label": field.label, "label": field.label,