From 1423f1a136eae31d0182a55c9f84602511533eb2 Mon Sep 17 00:00:00 2001 From: Akhil Narang Date: Wed, 9 Oct 2024 14:00:28 +0530 Subject: [PATCH 1/2] Revert "fix(grid): return if no df" This reverts commit 3fdd9624d8412b18c59995b76a5819e9a36f5d62. --- frappe/public/js/frappe/form/grid_row.js | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js index 69b69d71a3..b6688d754e 100644 --- a/frappe/public/js/frappe/form/grid_row.js +++ b/frappe/public/js/frappe/form/grid_row.js @@ -688,7 +688,6 @@ export default class GridRow { this.grid.visible_columns.forEach((col, ci) => { // to get update df for the row let df = fields.find((field) => field?.fieldname === col[0].fieldname); - if (!df) return; this.set_dependant_property(df); From ad3310116420397327f9df541bb44e1804eeceea Mon Sep 17 00:00:00 2001 From: Akhil Narang Date: Wed, 9 Oct 2024 14:19:57 +0530 Subject: [PATCH 2/2] Revert "Merge pull request #27502 from ljain112/fix-idx-pagination" This reverts commit 9dbe2571cf77b4a6febfd2ebd870a94e5748085a, reversing changes made to b841a7ccefedc1473c357ca61f6e16e216d50745. --- frappe/public/js/frappe/form/grid.js | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index acb174c5e6..68321fdd2e 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -123,7 +123,6 @@ export default class Grid { this.setup_add_row(); this.setup_grid_pagination(); - this.update_idx_and_name(); this.custom_buttons = {}; this.grid_buttons = this.wrapper.find(".grid-buttons"); @@ -146,17 +145,6 @@ export default class Grid { } } - update_idx_and_name() { - this.data.forEach((d, ri) => { - if (d.idx === undefined) { - d.idx = ri + 1; - } - if (d.name === undefined) { - d.name = "row " + d.idx; - } - }); - } - set_doc_url() { let unsupported_fieldtypes = frappe.model.no_value_type.filter( (x) => frappe.model.table_fields.indexOf(x) === -1 @@ -478,6 +466,12 @@ export default class Grid { if (!d) { return; } + if (d.idx === undefined) { + d.idx = ri + 1; + } + if (d.name === undefined) { + d.name = "row " + d.idx; + } let grid_row; if (this.grid_rows[ri] && !append_row) { grid_row = this.grid_rows[ri];