vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #37214 from sagarvora/fix/grid-row-docfield-contamination

Browse source 
fix: prevent docfield copy contamination across grid rows on deletion/reorder
This commit is contained in:
Sagar Vora 2026-02-19 10:32:46 +05:30 • committed by GitHub
commit 067a6351b5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 15 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/public/js/frappe/form/grid.js
View file

@ -574,7 +574,7 @@ export default class Grid {
let grid_row;
if (this.grid_rows[ri] && !append_row) {
grid_row = this.grid_rows[ri];
grid_row.doc = d;
grid_row.update_doc(d);
grid_row.refresh();
} else {
grid_row = new GridRow({

30
frappe/public/js/frappe/form/grid_row.js
View file

@ -53,25 +53,20 @@ export default class GridRow {
this.wrapper.appendTo(this.parent);
}
set_docfields(update = false) {
update_doc(doc) {
const changed = !this.doc || this.doc !== doc;
this.doc = doc;
if (changed) this.set_docfields();
}
set_docfields() {
if (this.doc && this.parent_df.options) {
frappe.meta.make_docfield_copy_for(
this.docfields = frappe.meta.get_docfields(
this.parent_df.options,
this.doc.name,
this.docfields
null,
this.grid.docfields
);
const docfields = frappe.meta.get_docfields(this.parent_df.options, this.doc.name);
if (update) {
// to maintain references
this.docfields.forEach((df) => {
Object.assign(
df,
docfields.find((d) => d.fieldname === df.fieldname)
);
});
} else {
this.docfields = docfields;
}
}
}
@ -198,11 +193,6 @@ export default class GridRow {
);
}
refresh() {
// update docfields for new record
if (this.frm && this.doc && this.doc.__islocal) {
this.set_docfields(true);
}
if (this.frm && this.doc) {
this.doc = locals[this.doc.doctype][this.doc.name];
}

8
frappe/public/js/frappe/model/meta.js
View file

@ -91,8 +91,8 @@ $.extend(frappe.meta, {
};
},
get_docfields: function (doctype, name, filters) {
var docfield_map = frappe.meta.get_docfield_copy(doctype, name);
get_docfields: function (doctype, name, filters, docfield_list = null) {
var docfield_map = frappe.meta.get_docfield_copy(doctype, name, docfield_list);
var docfields = frappe.meta.sort_docfields(docfield_map);
@ -125,11 +125,11 @@ $.extend(frappe.meta, {
});
},
get_docfield_copy: function (doctype, name) {
get_docfield_copy: function (doctype, name, docfield_list = null) {
if (!name) return frappe.meta.docfield_map[doctype];
if (!(frappe.meta.docfield_copy[doctype] && frappe.meta.docfield_copy[doctype][name])) {
frappe.meta.make_docfield_copy_for(doctype, name);
frappe.meta.make_docfield_copy_for(doctype, name, docfield_list);
}
return frappe.meta.docfield_copy[doctype][name];