ali
/
formula_editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed bug with none in tables name

This commit is contained in:
Ali 2025-10-28 14:11:03 +04:00
parent 7d0b445ebc
commit 89a8912ea1
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
formula_editor/api.py
View File

@ -17,7 +17,7 @@ def get_doctype_fields(doctype):
if field.fieldtype in ["Int", "Float", "Currency"]: if field.fieldtype in ["Int", "Float", "Currency"]:
fields.append({ fields.append({
"fieldname": field.fieldname, "fieldname": field.fieldname,
"label": field.label, "label": field.label or field.fieldname, # ✅ Используем fieldname если нет label
"fieldtype": field.fieldtype "fieldtype": field.fieldtype
}) })
@ -27,9 +27,13 @@ def get_doctype_fields(doctype):
child_meta = frappe.get_meta(child.options) child_meta = frappe.get_meta(child.options)
for sub_field in child_meta.fields: for sub_field in child_meta.fields:
if sub_field.fieldtype in ["Int", "Float", "Currency"]: if sub_field.fieldtype in ["Int", "Float", "Currency"]:
# ✅ Используем fieldname если нет label для обоих полей
child_label = child.label or child.fieldname
sub_field_label = sub_field.label or sub_field.fieldname
fields.append({ fields.append({
"fieldname": f"{child.fieldname}_{sub_field.fieldname}", "fieldname": f"{child.fieldname}_{sub_field.fieldname}",
"label": f"{child.label} → {sub_field.label}", "label": f"{child_label} → {sub_field_label}",
"fieldtype": sub_field.fieldtype "fieldtype": sub_field.fieldtype
}) })
@ -53,7 +57,7 @@ def get_all_doctype_fields(doctype):
if field.fieldname and field.fieldtype not in excluded_types: if field.fieldname and field.fieldtype not in excluded_types:
field_data = { field_data = {
"fieldname": field.fieldname, "fieldname": field.fieldname,
"label": field.label or field.fieldname, "label": field.label or field.fieldname, # ✅ Используем fieldname если нет label
"fieldtype": field.fieldtype "fieldtype": field.fieldtype
} }

3
formula_editor/formula_editor/doctype/formula_editor/formula_editor.js
View File

@ -750,8 +750,7 @@ frappe.require([
return; return;
} }
let label = field.label ? field.label : "*Нет наименования*"; let label = field.label || field.fieldname || "*Нет наименования*"; // ✅ Сначала label, потом fieldname let match = label.match(/^(.*?)\s*→\s*(.*?)$/);
let match = label.match(/^(.*?)\s*→\s*(.*?)$/);
let table_name = match ? match[1] : field.fieldname.startsWith("table_") ? field.fieldname : "Основные поля"; let table_name = match ? match[1] : field.fieldname.startsWith("table_") ? field.fieldname : "Основные поля";
let field_label = match ? match[2] : label; let field_label = match ? match[2] : label;