From 8dde2cd43ccadbb1e1ad821f80c4f1e7d39b61cd Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 16 Mar 2023 09:45:43 +0530 Subject: [PATCH 1/3] fix: Clear dasboard comment to avoid duplicate - on save --- frappe/core/doctype/doctype/doctype.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/core/doctype/doctype/doctype.js b/frappe/core/doctype/doctype/doctype.js index d92277152c..37d80571d2 100644 --- a/frappe/core/doctype/doctype/doctype.js +++ b/frappe/core/doctype/doctype/doctype.js @@ -48,6 +48,7 @@ frappe.ui.form.on("DocType", { true ); } else if (frappe.boot.developer_mode) { + frm.dashboard.clear_comment(); let msg = __( "This site is running in developer mode. Any change made here will be updated in code." ); From 10a5861f11cc2da8097bb6b3f966194fa80ab47f Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 16 Mar 2023 09:47:53 +0530 Subject: [PATCH 2/3] fix: Fill partially entered data to quick entry - if the autoname is "prompt" the auto fill was not working Co-authored-by: Rushabh Mehta --- frappe/public/js/frappe/model/create_new.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/public/js/frappe/model/create_new.js b/frappe/public/js/frappe/model/create_new.js index ebe565f6a4..523cb3b7a6 100644 --- a/frappe/public/js/frappe/model/create_new.js +++ b/frappe/public/js/frappe/model/create_new.js @@ -48,6 +48,8 @@ $.extend(frappe.model, { // set title field / name as name if (meta.autoname && meta.autoname.indexOf("field:") !== -1) { doc[meta.autoname.substr(6)] = frappe.route_options.name_field; + } else if (meta.autoname && meta.autoname === "prompt") { + doc.__newname = frappe.route_options.name_field; } else if (meta.title_field) { doc[meta.title_field] = frappe.route_options.name_field; } From 8aac4aae759356b02bda099288c749dc31ea69f4 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 16 Mar 2023 10:10:52 +0530 Subject: [PATCH 3/3] fix(grid): Show filter row if some filters are already applied --- frappe/public/js/frappe/form/grid_row.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js index f0795f1213..27ca3dba0c 100644 --- a/frappe/public/js/frappe/form/grid_row.js +++ b/frappe/public/js/frappe/form/grid_row.js @@ -40,7 +40,7 @@ export default class GridRow { render_row = this.render_row(); } - if (!this.render_row) return; + if (!render_row) return; this.set_data(); this.wrapper.appendTo(this.parent); @@ -762,7 +762,8 @@ export default class GridRow { show_search_row() { // show or remove search columns based on grid rows - this.show_search = this.show_search && this.grid?.data?.length >= 20; + this.show_search = + this.show_search && (this.grid?.data?.length >= 20 || this.grid.filter_applied); !this.show_search && this.wrapper.remove(); return this.show_search; }