test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #385 from frappe/develop

Browse Source 
chore: Merge develop to main
This commit is contained in:
Shariq Ansari 2024-09-29 14:39:39 +05:30 committed by GitHub
commit 5c219c51f3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crm/api/doc.py
View File

@ -611,10 +611,10 @@ def get_field_obj(field):
"all_properties": field,
}
obj["placeholder"] = field.placeholder or "Add " + field.label + "..."
obj["placeholder"] = field.get("placeholder") or "Add " + field.label + "..."
if field.fieldtype == "Link":
obj["placeholder"] = field.placeholder or "Select " + field.label + "..."
obj["placeholder"] = field.get("placeholder") or "Select " + field.label + "..."
obj["doctype"] = field.options
elif field.fieldtype == "Select" and field.options:
obj["options"] = [{"label": option, "value": option} for option in field.options.split("\n")]
@ -686,7 +686,7 @@ def get_fields(doctype: str, allow_all_fieldtypes: bool = False):
"mandatory_depends_on": field.mandatory_depends_on,
"read_only_depends_on": field.read_only_depends_on,
"link_filters": field.get("link_filters"),
"placeholder": field.placeholder,
"placeholder": field.get("placeholder"),
})
return _fields

2
crm/fcrm/doctype/crm_fields_layout/crm_fields_layout.py
View File

@ -44,7 +44,7 @@ def get_fields_layout(doctype: str, type: str):
"type": field.fieldtype,
"options": field.options,
"mandatory": field.reqd,
"placeholder": field.placeholder,
"placeholder": field.get("placeholder"),
}
section["fields"][section.get("fields").index(field["name"])] = field