From 6c6deb443e14b92b684dc1cdb711a3e17b97c3a7 Mon Sep 17 00:00:00 2001 From: Sumit Bhanushali Date: Wed, 16 Oct 2024 14:29:04 +0530 Subject: [PATCH 1/2] fix(PrintFormatBuilder): filter fields should filter all fields --- .../PrintFormatControls.vue | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/frappe/public/js/print_format_builder/PrintFormatControls.vue b/frappe/public/js/print_format_builder/PrintFormatControls.vue index 2772f2ead4..0d38ad41a8 100644 --- a/frappe/public/js/print_format_builder/PrintFormatControls.vue +++ b/frappe/public/js/print_format_builder/PrintFormatControls.vue @@ -157,7 +157,34 @@ let margins = computed(() => { ]; }); let fields = computed(() => { - let fields = meta.value.fields + let fields = [ + { + label: __("Custom HTML"), + fieldname: "custom_html", + fieldtype: "HTML", + html: "", + custom: 1, + }, + { + label: __("ID (name)"), + fieldname: "name", + fieldtype: "Data", + }, + { + label: __("Spacer"), + fieldname: "spacer", + fieldtype: "Spacer", + custom: 1, + }, + { + label: __("Divider"), + fieldname: "divider", + fieldtype: "Divider", + custom: 1, + }, + ...print_templates.value, + ...meta.value.fields, + ] .filter((df) => { if (["Section Break", "Column Break"].includes(df.fieldtype)) { return false; @@ -187,34 +214,7 @@ let fields = computed(() => { return out; }); - return [ - { - label: __("Custom HTML"), - fieldname: "custom_html", - fieldtype: "HTML", - html: "", - custom: 1, - }, - { - label: __("ID (name)"), - fieldname: "name", - fieldtype: "Data", - }, - { - label: __("Spacer"), - fieldname: "spacer", - fieldtype: "Spacer", - custom: 1, - }, - { - label: __("Divider"), - fieldname: "divider", - fieldtype: "Divider", - custom: 1, - }, - ...print_templates.value, - ...fields, - ]; + return fields; }); let print_templates = computed(() => { let templates = print_format.value.__onload.print_templates || {}; From 584b8d7046ea69a6049d61d53d7683024ea68711 Mon Sep 17 00:00:00 2001 From: Sumit Bhanushali Date: Wed, 16 Oct 2024 14:29:43 +0530 Subject: [PATCH 2/2] fix(PrintFormatBuilder): search should be case insensitive --- frappe/public/js/print_format_builder/PrintFormatControls.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/print_format_builder/PrintFormatControls.vue b/frappe/public/js/print_format_builder/PrintFormatControls.vue index 0d38ad41a8..4026d12087 100644 --- a/frappe/public/js/print_format_builder/PrintFormatControls.vue +++ b/frappe/public/js/print_format_builder/PrintFormatControls.vue @@ -190,10 +190,10 @@ let fields = computed(() => { return false; } if (search_text.value) { - if (df.fieldname.includes(search_text.value)) { + if (df.fieldname.toLowerCase().includes(search_text.value.toLowerCase())) { return true; } - if (df.label && df.label.includes(search_text.value)) { + if (df.label && df.label.toLowerCase().includes(search_text.value.toLowerCase())) { return true; } return false;