Merge pull request #8518 from ruchamahabal/fix-webhook-fields

fix: webhook data
This commit is contained in:
mergify[bot] 2019-10-02 13:21:35 +00:00 committed by GitHub
commit 997dff896d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -8,11 +8,11 @@ frappe.webhook = {
// get doctype fields
let fields = $.map(frappe.get_doc("DocType", frm.doc.webhook_doctype).fields, (d) => {
if (frappe.model.no_value_type.includes(d.fieldtype) || frappe.model.table_fields.includes(d.fieldtype)) {
return { label: d.label + ' (' + d.fieldtype + ')', value: d.fieldname };
return null;
} else if (d.fieldtype === 'Currency' || d.fieldtype === 'Float') {
return { label: d.label, value: d.fieldname };
} else {
return null;
return { label: `${__(d.label)} (${d.fieldtype})`, value: d.fieldname };
}
});
@ -21,7 +21,7 @@ frappe.webhook = {
if (field.fieldname == "name") {
fields.unshift({ label: "Name (Doc Name)", value: "name" });
} else {
fields.push({ label: field.label + ' (' + field.fieldtype + ')', value: field.fieldname });
fields.push({ label: `${__(field.label)} (${field.fieldtype})`, value: field.fieldname });
}
}