From bb73d77ceca069b559d776ab88be24f033705384 Mon Sep 17 00:00:00 2001 From: Devin Slauenwhite Date: Fri, 8 Dec 2023 19:08:34 +0000 Subject: [PATCH 1/3] fix: grid row default values with not using model --- frappe/public/js/frappe/form/grid.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index b5942c7f46..0d97ce165d 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -834,7 +834,13 @@ export default class Grid { if (!this.df.data) { this.df.data = this.get_data() || []; } - this.df.data.push({ idx: this.df.data.length + 1, __islocal: true }); + const defaults = this.docfields.reduce((acc, d) => { + acc[d.fieldname] = d.default; + return acc; + }, {}); + this.df.data.push( + $.extend({ idx: this.df.data.length + 1, __islocal: true }, defaults) + ); this.refresh(); } From c2eff72f022ef20567ca8895d3dbe53a52418357 Mon Sep 17 00:00:00 2001 From: Devin Slauenwhite Date: Wed, 14 Feb 2024 09:54:52 -0500 Subject: [PATCH 2/3] fix: replace $.extend with spread operator Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> --- frappe/public/js/frappe/form/grid.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 0d97ce165d..86d9fc364b 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -838,9 +838,7 @@ export default class Grid { acc[d.fieldname] = d.default; return acc; }, {}); - this.df.data.push( - $.extend({ idx: this.df.data.length + 1, __islocal: true }, defaults) - ); + this.df.data.push({ idx: this.df.data.length + 1, __islocal: true, ...defaults}); this.refresh(); } From fb8507b1fb4b4910861cff8511d493226ba6e33b Mon Sep 17 00:00:00 2001 From: Devin Slauenwhite Date: Wed, 14 Feb 2024 10:44:34 -0500 Subject: [PATCH 3/3] chore: correct linter failure Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> --- frappe/public/js/frappe/form/grid.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 86d9fc364b..64e0783b74 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -838,7 +838,7 @@ export default class Grid { acc[d.fieldname] = d.default; return acc; }, {}); - this.df.data.push({ idx: this.df.data.length + 1, __islocal: true, ...defaults}); + this.df.data.push({ idx: this.df.data.length + 1, __islocal: true, ...defaults }); this.refresh(); }