From b9bd05581323085d44b365b2027ad011e180bc04 Mon Sep 17 00:00:00 2001 From: Hussain Nagaria Date: Tue, 27 Jun 2023 17:10:46 +0530 Subject: [PATCH 1/2] fix(WebForm): auto-increment link field --- frappe/public/js/frappe/form/controls/autocomplete.js | 9 +++++++++ frappe/website/doctype/web_form/web_form.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/autocomplete.js b/frappe/public/js/frappe/form/controls/autocomplete.js index 27bf75e807..c0674956e9 100644 --- a/frappe/public/js/frappe/form/controls/autocomplete.js +++ b/frappe/public/js/frappe/form/controls/autocomplete.js @@ -174,6 +174,15 @@ frappe.ui.form.ControlAutocomplete = class ControlAutoComplete extends frappe.ui if (typeof options[0] === "string") { options = options.map((o) => ({ label: o, value: o })); } + + options = options.map((o) => { + if (typeof o !== "string") { + o.label = o.label.toString(); + o.value = o.value.toString(); + } + return o; + }); + return options; } diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py index fd9949c45f..75f8793b4a 100644 --- a/frappe/website/doctype/web_form/web_form.py +++ b/frappe/website/doctype/web_form/web_form.py @@ -631,7 +631,7 @@ def get_link_options(web_form_name, doctype, allow_read_on_all_link_options=Fals if title_field and show_title_field_in_link: return json.dumps(link_options, default=str) else: - return "\n".join([doc.value for doc in link_options]) + return "\n".join([str(doc.value) for doc in link_options]) else: raise frappe.PermissionError( From aaf1bd7f4bcd21db2e36888ac48d91d2260f772f Mon Sep 17 00:00:00 2001 From: Hussain Nagaria Date: Wed, 28 Jun 2023 11:46:17 +0530 Subject: [PATCH 2/2] style: fix linter whitespace issue --- frappe/public/js/frappe/form/controls/autocomplete.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/autocomplete.js b/frappe/public/js/frappe/form/controls/autocomplete.js index c0674956e9..7b91a2031c 100644 --- a/frappe/public/js/frappe/form/controls/autocomplete.js +++ b/frappe/public/js/frappe/form/controls/autocomplete.js @@ -182,7 +182,7 @@ frappe.ui.form.ControlAutocomplete = class ControlAutoComplete extends frappe.ui } return o; }); - + return options; }